Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 22859)
+++ applications/editors/josm/i18n/po/ar.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-13 23:57+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 01:07+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-08-20 19:13+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -95,5 +95,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "التحذير"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "محرر جافا خريطة الطريق المفتوحة"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -233,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -262,5 +262,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -295,5 +295,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -402,4 +402,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -417,5 +418,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1033,5 +1034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1040,5 +1041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr ""
@@ -1431,13 +1432,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1446,5 +1447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1452,9 +1453,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1462,5 +1463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1494,8 +1495,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1504,9 +1505,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1522,6 +1523,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1531,5 +1532,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1554,6 +1555,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "خطأ"
@@ -1710,5 +1711,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr ""
@@ -1982,5 +1983,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2443,5 +2444,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2482,18 +2483,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2751,5 +2752,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "إبحث"
@@ -2939,7 +2940,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3201,5 +3202,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3353,31 +3354,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3396,15 +3397,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3413,5 +3414,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3420,5 +3421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3427,5 +3428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3434,5 +3435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3440,5 +3441,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3447,5 +3448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3454,5 +3455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3461,5 +3462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3468,10 +3469,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3591,5 +3592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3661,9 +3662,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3671,5 +3672,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3871,14 +3872,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "الإختصار"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "اقفز إلى هناك"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3903,9 +3923,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3948,5 +3968,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -3967,5 +3987,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4218,69 +4238,69 @@
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4290,9 +4310,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4300,57 +4320,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "جاري التهيئة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "جزيرة"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4360,9 +4393,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4376,9 +4409,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4500,23 +4534,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4607,5 +4641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4613,17 +4647,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4633,25 +4667,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5046,4 +5080,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5126,4 +5161,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5140,4 +5176,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5211,5 +5248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5221,10 +5258,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "الكلّ"
@@ -5306,5 +5343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5320,5 +5357,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5353,17 +5390,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5371,15 +5408,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5387,10 +5424,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5402,5 +5439,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5412,5 +5449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5553,5 +5590,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5664,5 +5701,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5670,5 +5707,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5676,5 +5713,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5682,5 +5719,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5688,5 +5725,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5695,5 +5732,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5701,5 +5738,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5707,5 +5744,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5713,24 +5750,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5751,5 +5788,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5774,37 +5811,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "أدخل الأحداثيات للعقدة الجديدة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "إستعمل الدرجات العشرية."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "الرجاء إدخال خط طول صالح  من ضمن المجال  -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "الرجاء إدخال خط طول  من ضمن المجال  -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "الرجاء إدخال خط عرض صالح  من ضمن المجال -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "الرجاء إدخال خط عرض  من ضمن المجال -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "أغلق الحوار و أنشئ عقدة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "أغلق الحوار، لا تأنشئ عقدة جديدة"
@@ -5860,9 +5897,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "العلاقات"
@@ -5910,10 +5947,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5933,37 +5970,37 @@
 msgstr "إفتح نافذة لائحة خيارات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5972,32 +6009,32 @@
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "الخيار: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "أنقر لتكبير/تصغير محتويات اللوحة"
@@ -6274,13 +6311,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6392,4 +6429,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6408,6 +6449,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6425,8 +6464,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6437,4 +6483,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6449,33 +6501,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6499,12 +6540,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6576,10 +6627,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6609,8 +6664,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6673,6 +6724,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6725,4 +6774,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6787,32 +6848,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6821,6 +6890,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6829,24 +6900,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6861,82 +6922,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7017,155 +7078,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "الإسم"
@@ -7589,4 +7655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<مختلف>"
@@ -8091,17 +8158,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8376,4 +8443,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8381,15 +8449,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "النوع"
@@ -8408,16 +8476,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "مجهول"
@@ -8982,5 +9050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9203,20 +9271,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr ""
@@ -9663,5 +9731,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "الإسم: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "الوصف: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "الطول: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9669,62 +9795,21 @@
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "الإسم: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "الوصف: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] ""
 msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "الطول: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9734,10 +9819,10 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9748,7 +9833,7 @@
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9756,10 +9841,10 @@
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9767,10 +9852,10 @@
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9778,21 +9863,21 @@
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9802,9 +9887,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9812,5 +9897,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9818,30 +9903,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9849,5 +9934,5 @@
 msgstr "خصّص اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9856,5 +9941,5 @@
 msgstr "الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9863,18 +9948,18 @@
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9884,23 +9969,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10341,15 +10426,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11284,4 +11369,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "القيمة الغيابية هي ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11364,5 +11492,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "السيارة"
@@ -11381,16 +11509,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "الدراجة"
@@ -11424,12 +11552,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "المشي"
@@ -11676,18 +11804,18 @@
 msgstr "الغيابي (محدد تلقائياً)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "تمكين الغيابيات المبيتة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12003,26 +12131,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12138,6 +12258,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "البديل"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12354,12 +12483,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12539,5 +12660,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12546,49 +12667,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "مزيد من المعلومات عن هذه الميزة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "ميزات خيارية:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12598,15 +12719,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12620,17 +12741,17 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13236,5 +13357,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13332,5 +13453,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13339,5 +13460,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13406,5 +13527,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13414,10 +13535,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13425,5 +13546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13431,5 +13552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13437,10 +13558,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13448,5 +13569,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13454,5 +13575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13460,5 +13581,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13467,10 +13588,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13478,9 +13599,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13488,11 +13609,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "غرض غير مسموح به معروف بــ id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13504,8 +13625,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13519,5 +13640,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13525,5 +13646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13532,6 +13653,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13543,6 +13664,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13551,5 +13672,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13557,5 +13678,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13563,12 +13684,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13576,5 +13697,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13584,5 +13705,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13592,5 +13713,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13598,17 +13719,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14104,11 +14225,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14117,16 +14238,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14135,5 +14256,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14154,13 +14275,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "لا تفعل أي شيء"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "بلّغ عن علّة"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14169,9 +14290,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "الشذوذ غيرال متوقع"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14179,5 +14300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14185,5 +14306,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14192,5 +14313,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14198,9 +14319,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14394,5 +14515,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14445,5 +14566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14453,5 +14574,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14461,5 +14582,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14470,5 +14591,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(تلميحة: يمكنك تحرير المختصرات في التفضيلات)"
@@ -14569,5 +14690,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14653,10 +14774,60 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "أزقات الإفتتاح"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "غيّر الخصائص"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "إختر"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "الخريطة: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "العدة: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+msgid "open end"
+msgstr ""
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -14828,51 +14999,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "غير قادر على تحريك الأغراض إلى خارج الدنيا"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14971,16 +15144,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -14994,5 +15159,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15105,5 +15270,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "مباني"
@@ -15340,5 +15505,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15753,8 +15918,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15868,6 +16029,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr ""
@@ -17219,5 +17380,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "النقل المشترك"
@@ -17261,48 +17422,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "غيّر الخيار"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "التحم عن بعد"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17311,34 +17476,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "الأفعال المسموح بها"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "هل تريد السماح بذلك ؟"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17561,58 +17726,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17896,11 +18061,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "حرّر خط أنابيب"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -18978,5 +19142,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -19096,59 +19260,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19627,142 +19791,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "إلى أعلى"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "الرجاء إدخال إسم المستخدم"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19782,7 +19944,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "متعدد"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19896,9 +20057,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -19957,21 +20118,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -19982,5 +20143,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -19989,5 +20150,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -19995,10 +20156,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20007,24 +20168,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20035,75 +20196,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -20662,16 +20847,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20679,5 +20869,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20685,5 +20875,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20692,5 +20882,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20699,10 +20889,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20710,15 +20900,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20728,5 +20918,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20735,10 +20925,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20747,5 +20937,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20754,15 +20944,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20772,15 +20962,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20789,5 +20979,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20796,5 +20986,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20803,10 +20993,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20815,5 +21005,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20823,5 +21013,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20830,20 +21020,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20852,5 +21042,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20892,4 +21082,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20922,10 +21113,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr ""
@@ -20936,5 +21127,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -20943,5 +21134,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr ""
@@ -20978,10 +21169,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr ""
@@ -20995,8 +21186,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr ""
@@ -21015,13 +21206,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -21055,17 +21246,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr ""
@@ -21102,17 +21293,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21146,17 +21337,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr ""
@@ -21187,17 +21378,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr ""
@@ -21228,17 +21419,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr ""
@@ -21246,5 +21437,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr ""
@@ -21253,5 +21444,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr ""
@@ -21259,5 +21450,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr ""
@@ -21266,5 +21457,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr ""
@@ -21274,6 +21465,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21281,5 +21472,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr ""
@@ -21288,5 +21479,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr ""
@@ -21299,5 +21490,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -21306,5 +21497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr ""
@@ -21312,10 +21503,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr ""
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -21327,5 +21518,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -21335,5 +21526,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr ""
@@ -21341,5 +21532,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr ""
@@ -21349,5 +21540,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -21359,5 +21550,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -21367,5 +21558,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -21375,6 +21566,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21397,15 +21588,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21417,5 +21608,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -21424,5 +21615,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr ""
@@ -21442,12 +21633,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr ""
@@ -21469,166 +21660,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "غابة/حرش"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21636,5 +21827,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -21643,5 +21834,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -21649,5 +21840,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "المشاة"
@@ -21656,5 +21847,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "حرّر شارع للمشاة"
@@ -21662,5 +21853,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr ""
@@ -21669,5 +21860,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr ""
@@ -21677,18 +21868,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21696,5 +21887,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -21704,10 +21895,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -21716,5 +21907,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -21722,14 +21913,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr ""
@@ -21745,5 +21936,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr ""
@@ -21752,5 +21943,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr ""
@@ -21759,15 +21950,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -21775,5 +21966,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr ""
@@ -21799,4 +21990,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21804,4 +21996,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21877,236 +22075,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr ""
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr ""
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr ""
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22121,10 +22326,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr ""
@@ -22140,10 +22345,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
@@ -22158,19 +22364,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -22178,20 +22384,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "الإرتفاع الأقصى (أمتار)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22199,5 +22405,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr ""
@@ -22208,5 +22414,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr ""
@@ -22226,10 +22432,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -22251,10 +22457,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22276,10 +22482,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22301,5 +22507,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22314,9 +22520,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr ""
@@ -22330,9 +22536,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "شارع سكني"
@@ -22376,10 +22582,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22409,5 +22615,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22419,10 +22625,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "حرّر جسر"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "حرّر خندق"
@@ -22430,10 +22636,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22442,35 +22648,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22478,5 +22684,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr ""
@@ -22485,76 +22691,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr ""
@@ -22563,5 +22769,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22569,5 +22775,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -22575,5 +22781,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22591,11 +22797,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "حرّر طريق للدراجات"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22603,5 +22809,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22609,5 +22815,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22615,5 +22821,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22622,5 +22828,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "حرّر طريق قدم"
@@ -22628,5 +22834,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "درجات"
@@ -22636,10 +22842,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr ""
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "تقاطع طرقات سريعة"
@@ -22647,15 +22858,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "الرقم"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "الخدمات"
@@ -22663,5 +22874,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "حرّر محطة خدمات"
@@ -22669,10 +22880,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22701,36 +22913,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "شركة الإدارة"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "جدول نهر"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "حرّر مطعم"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "هاتف طوارئ"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "إشارة سير"
@@ -22740,5 +22973,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "نوع التقاطع للمشاة"
@@ -22747,27 +22980,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "إشارات_السير"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "جزيرة"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22775,6 +23008,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22783,11 +23016,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22795,30 +23028,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "طير الطوقان"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "نمر"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "إشارة وقوف"
@@ -22826,67 +23059,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "تقاطع مشاة"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "مستديرة صغيرة"
@@ -22897,14 +23068,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "الإتجاه"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "إتجاه عقارب الساعة"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "تقاطع مشاة"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr ""
@@ -22914,5 +23147,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "حدود المدينة"
@@ -22920,15 +23153,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "الإسم الثاني"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "كاميرا مراقبة السير"
@@ -22937,11 +23170,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "هاتف طوارئ"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22949,5 +23177,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -22955,5 +23183,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -22963,10 +23191,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "مخاضة"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "حرر المخاضة"
@@ -22974,5 +23202,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr ""
@@ -22980,5 +23208,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -22987,10 +23215,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -22998,5 +23226,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "حواجز"
@@ -23004,5 +23232,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23010,5 +23238,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23053,16 +23281,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
@@ -23071,5 +23299,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23077,5 +23305,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23083,10 +23311,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23094,15 +23322,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr ""
@@ -23110,5 +23338,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr ""
@@ -23116,10 +23344,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "مراقبة الحدود"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "حرّر مراقبة الحدود"
@@ -23128,5 +23356,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr ""
@@ -23137,22 +23365,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "حائط/جدار"
@@ -23160,5 +23388,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "حائط/جدار مدينة"
@@ -23167,5 +23395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23176,10 +23404,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr ""
@@ -23187,5 +23415,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr ""
@@ -23193,50 +23421,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23244,25 +23472,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23270,25 +23498,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "الماء"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "نبع"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "حرّر نبع"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "مسرب"
@@ -23296,10 +23513,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23307,10 +23524,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "جدول نهر"
@@ -23318,10 +23535,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "قناة"
@@ -23329,10 +23546,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "نهر"
@@ -23342,59 +23559,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "نهر"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "نبع"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "حرّر نبع"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "شلال ماء"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "حرّر شلال ماء"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "سدّ (صغير)"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "سدّ (صغير)"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "سدّ"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "حرّر سدّ"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "حوض"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "حرّر حوض"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "خزان"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "حرّر خزان"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "خزان مغطى"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "حرّر خزان مغطى"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "حرّر الماء"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "حوض"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "حرّر حوض"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "خزان"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "حرّر خزان"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "خزان مغطى"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "حرّر خزان مغطى"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "شاطئ"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "حرّر شاطئ"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -23403,10 +23674,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -23417,14 +23689,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "مستنقع"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -23438,35 +23710,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "وحل"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -23474,20 +23746,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "خليج"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -23495,145 +23767,215 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "شاطئ"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "حرّر شاطئ"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "تسوق"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "السيارة"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "مبتدئ"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr ""
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "حوض سفن"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "حرّر حوض سفن"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "مرسى"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "حرّر مرسى"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "سدّ"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "حرّر سدّ"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "نقطة مجرى ماء"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "مارينا"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "حرّر مارينا"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "رصيف ميناء"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "حرّر رصيف ميناء"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr ""
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "سدّ (صغير)"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "سدّ (صغير)"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "شلال ماء"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "حرّر شلال ماء"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "مارينا"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "حرّر مارينا"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "رصيف ميناء"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "حرّر رصيف ميناء"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23643,16 +23985,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "حوض سفن"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "حرّر حوض سفن"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "مرسى"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "حرّر مرسى"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "سكة"
@@ -23660,5 +24024,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -23688,7 +24052,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23704,8 +24068,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23719,29 +24083,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23754,8 +24118,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23826,8 +24190,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23839,8 +24203,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "التوتر"
@@ -23853,8 +24217,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23867,23 +24231,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "قطار ذات سكة حديد واحدة"
@@ -23891,50 +24255,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "حرّر قطار ذات سكة حديد واحدة"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "قطار نفقي"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "حرّر قطار نفقي"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "ترام"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "حرّر ترام"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -23942,5 +24306,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23949,10 +24313,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "سكة حديد غير مستعملة"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "حرّر سكة حديد غير مستعملة"
@@ -23961,9 +24325,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -23972,5 +24336,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -23979,5 +24343,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -23987,5 +24351,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -23993,5 +24357,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr ""
@@ -24000,5 +24364,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24007,10 +24371,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -24018,10 +24382,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24029,10 +24393,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr ""
@@ -24040,10 +24404,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24051,10 +24415,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24063,5 +24428,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24069,5 +24434,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24076,5 +24441,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24082,5 +24447,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "وقود"
@@ -24090,69 +24455,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "الأرض اليابسة"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24169,34 +24556,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24204,37 +24592,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24255,33 +24654,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24290,170 +24691,191 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "متجر/دكان"
+
+#: build/trans_presets.java:1359
+msgid "convenience"
+msgstr ""
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "كشك"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24461,4 +24883,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24470,6 +24893,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr ""
@@ -24478,5 +24901,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -24487,25 +24910,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "الرقم المرجعي"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "مساحة"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "تحت الأرض"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24514,54 +24939,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "حرّر متجر سيارات"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "النوع"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "حرّر شجرة"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "إتصل بــ {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "رقم الهاتف"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -24570,10 +25139,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -24581,28 +25149,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "حرّر موقف دراجة"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "إستيعاب"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "الدراجة النارية"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "الدراجة النارية"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "الخدمات"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "إحفَظ"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "الأرض اليابسة"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "التعيينات المسبقة"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "ملابس"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "إستيعاب"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "حرر مبيع قطع دراجات"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24612,5 +25239,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24618,5 +25245,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24624,5 +25251,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -24630,5 +25257,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -24636,5 +25263,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -24643,5 +25270,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -24649,5 +25276,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -24656,5 +25283,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -24666,5 +25293,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24672,10 +25299,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -24684,10 +25311,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -24696,5 +25323,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -24703,5 +25330,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -24709,5 +25336,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -24717,13 +25344,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "ملجأ"
@@ -24731,19 +25357,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -24751,5 +25377,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "تاكسي"
@@ -24757,5 +25383,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -24763,10 +25389,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "مطار"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24774,5 +25400,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24780,10 +25406,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr ""
@@ -24792,5 +25418,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24798,5 +25424,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24804,5 +25430,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24810,5 +25436,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24816,5 +25442,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24822,5 +25448,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24830,5 +25456,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24838,5 +25464,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24847,6 +25473,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -24856,5 +25482,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24863,5 +25489,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24869,5 +25495,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24875,15 +25501,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -24895,5 +25521,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -24902,5 +25528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
@@ -24913,8 +25539,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "النجوم"
@@ -24938,34 +25564,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -24979,168 +25605,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "رقم الهاتف"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -25148,20 +25679,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "كوخ"
@@ -25169,10 +25700,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "نزل"
@@ -25180,30 +25711,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -25211,10 +25743,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -25225,5 +25757,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -25231,5 +25763,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -25237,5 +25769,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -25243,79 +25777,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -25323,18 +25857,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25342,10 +25876,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -25353,10 +25887,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "حانة"
@@ -25364,20 +25903,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "حانة"
@@ -25385,10 +25924,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -25396,25 +25935,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "متحف"
@@ -25422,9 +25961,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -25433,9 +25972,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr ""
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr ""
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "أعمال فنية"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "حرّر أعمال فنية"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -25443,50 +26003,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr ""
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr ""
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "أعمال فنية"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "حرّر أعمال فنية"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "حرّر ملجأ"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr ""
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "موقع تنزه"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "حرّر موقع تنزه"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25524,5 +26085,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25530,28 +26091,28 @@
 msgstr "شارع"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25561,5 +26122,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25567,5 +26128,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr ""
@@ -25573,6 +26134,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -25580,5 +26141,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25586,6 +26147,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "تزلّج"
@@ -25593,5 +26154,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25599,46 +26160,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25647,5 +26208,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25653,55 +26214,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "حرّر ملجأ"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr ""
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "موقع تنزه"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "حرّر موقع تنزه"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "قلعة"
@@ -25710,19 +26250,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -25731,9 +26271,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -25741,10 +26281,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25752,5 +26292,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25758,15 +26298,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "ضريح"
@@ -25774,55 +26314,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "حرّر ضريح"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "ملعب"
@@ -25830,35 +26370,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -25872,6 +26412,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -26287,6 +26827,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26321,240 +26861,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26571,5 +27111,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26596,23 +27135,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "النوع"
@@ -26629,5 +27176,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26654,211 +27200,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "رياضة المحركات"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "حرّر رياضة المحركات"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -26866,52 +27415,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "رماية"
@@ -26919,204 +27468,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "رياضة المحركات"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "حرّر رياضة المحركات"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "التحذير"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "موقف سيارات"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "رياضة المحركات"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "حرّر رياضة المحركات"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "حرّر تزحلق"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "حرّر مراقبة الحدود"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "السيارة"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "حرّر حانة"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "مبنى"
@@ -27124,5 +27739,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -27130,10 +27745,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -27141,10 +27756,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "سفارة"
@@ -27152,10 +27767,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "محكمة"
@@ -27164,10 +27779,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "سجن"
@@ -27176,10 +27791,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "شرطة"
@@ -27189,10 +27804,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -27201,10 +27816,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -27212,5 +27827,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -27218,15 +27833,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "مدرسة"
@@ -27234,10 +27849,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "جامعة"
@@ -27245,10 +27860,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "كلّية"
@@ -27256,5 +27871,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -27262,5 +27877,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "سينما"
@@ -27269,10 +27884,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "مكتبة"
@@ -27281,9 +27896,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -27291,10 +27906,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "مسرح"
@@ -27303,10 +27918,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "معبد"
@@ -27316,5 +27931,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -27323,6 +27938,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "الديانة"
@@ -27331,66 +27946,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -27399,189 +28014,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "سنّي"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "عناوين"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "حرّر معلومات عنوان"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "رقم المنزل"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "تسمية المنزل"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "إسم الشارع"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "إسم المدينة"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "الرمز البريدي"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "رمز البلد"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "حرّر إستيفاء العنوان"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "مخطط الترقيم"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "مفرد"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "مثنى"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27589,25 +28134,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "منارة"
@@ -27615,10 +28160,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -27626,10 +28171,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -27638,41 +28183,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -27682,10 +28227,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "ونش"
@@ -27693,5 +28238,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "حرّر ونش"
@@ -27699,10 +28244,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -27710,10 +28255,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -27721,23 +28266,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -27747,35 +28292,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -27784,10 +28329,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -27796,5 +28341,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -27802,10 +28347,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -27816,23 +28361,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -27841,20 +28386,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27862,55 +28407,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "مراحيض"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "هاتف"
@@ -27919,5 +28464,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -27925,5 +28470,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -27931,5 +28476,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "الملاحظات"
@@ -27937,5 +28482,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27943,5 +28488,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr ""
@@ -27949,15 +28494,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -27966,5 +28511,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -27972,35 +28517,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "علب (معدنية)"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "ملابس"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28008,5 +28548,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28015,31 +28555,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28118,5 +28658,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28126,31 +28666,31 @@
 msgstr "خضار"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28158,31 +28698,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "نافورة"
@@ -28191,10 +28731,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -28203,10 +28743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28215,5 +28755,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28221,120 +28761,219 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "المشي"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "سوبرماركت"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "حرّر سوبرماركت"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "كشك"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "حرّر كشك"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "جزار"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "حرّر جزار"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "خباز"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "حرّر خباز"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "مأكولات عضوية"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "حرّر مبيع مأكولات عضوية"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "مشروبات"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "حرّر متجر سيارات"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "حرر مبيع قطع دراجات"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "سوبرماركت"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "حرّر سوبرماركت"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr ""
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr ""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "كشك"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "حرّر كشك"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "جزار"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "حرّر جزار"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "خباز"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "حرّر خباز"
-
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "حلاق"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "حرّر حلاق"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "حرّر نظاراتي"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "حرّر مبيع قطع حاسوب"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "أحذية"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "حرّر أحذية"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "نشاطات في الخلاء"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "حرّر متجر نشاطات في الخلاء"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "تنظيف جاف"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "حرّر تنظيف جاف"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "مصبغة/غسيل"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "حرّر مصبغة/غسيل"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "سكة"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "حرّر سكة"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "حاسوب"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "حرّر مبيع قطع حاسوب"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "إلكترونيات"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "حرّر إلكترونيات"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "حرّر مبيع Hifi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "مرئيّات"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "حرّر مبيع مرئيّات"
+
+#. <separator/>
+#: build/trans_presets.java:2970
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -28342,193 +28981,85 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2972
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "مأكولات عضوية"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "حرّر مبيع مأكولات عضوية"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "مشروبات"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "حاسوب"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "حرّر مبيع قطع حاسوب"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "إلكترونيات"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "حرّر إلكترونيات"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "حرّر مبيع Hifi"
-
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "خردوات/أدوات منزلية"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "حرّر مخزن خردوات/أدوات منزلية"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2998
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2999
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "خردوات/أدوات منزلية"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "حرّر مخزن خردوات/أدوات منزلية"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:3004
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3005
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "حلاق"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "حرّر حلاق"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "أحذية"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "حرّر أحذية"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "مرئيّات"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "حرّر مبيع مرئيّات"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "تنظيف جاف"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "حرّر تنظيف جاف"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "مصبغة/غسيل"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "حرّر مصبغة/غسيل"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "نشاطات في الخلاء"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "حرّر متجر نشاطات في الخلاء"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "حرّر نظاراتي"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -28536,5 +29067,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr ""
@@ -28542,97 +29073,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "مصرف"
@@ -28640,14 +29171,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -28655,5 +29186,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -28661,15 +29192,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "أطباء"
@@ -28677,18 +29208,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -28696,5 +29227,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -28702,9 +29233,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "مستشفى"
@@ -28712,10 +29243,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -28724,5 +29266,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -28731,15 +29273,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -28747,5 +29289,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "بيطري"
@@ -28754,368 +29296,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "الحدود"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "دولية"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "حرّر حدود دولية"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "إدارية"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "حرّر حدود إدارية"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "مدنية"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "حرّر حدود إدارية"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "حرّر الحدود السياسية"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "محمية وطنية (بيئية)"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "حرّر محمية وطنية (التنوع البيئي)"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "الأماكن"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "قارة"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "وطن"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "دولة/ولاية"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "قطر/منطقة"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr ""
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr ""
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "مدينة"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "بلدة"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "ضاحية"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "قرية"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "محلة"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "قمّة"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "حرّر قمّة"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "جليد"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "حرّر جليد"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "بركان"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "حرّر بركان"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "مدخل كهف"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "حرّر مدخل كهف"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "جزيرة"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "الطبيعة"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "شجرة"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "حرّر شجرة"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "حرّر اإسم النباتي"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "حرج"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "حرّر حرج"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "صنوبري الثمر"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr ""
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "مختلط"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "غابة"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "حرّر غابة"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "محمية طبيعية"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "حرّر محمية طبيعية"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "مدخل كهف"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "حرّر مدخل كهف"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "قمّة"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "حرّر قمّة"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "جليد"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "حرّر جليد"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "بركان"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "حرّر بركان"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "الحدود"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "دولية"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "حرّر حدود دولية"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "إدارية"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "حرّر حدود إدارية"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "مدنية"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "حرّر حدود إدارية"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "حرّر الحدود السياسية"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "محمية وطنية (بيئية)"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "حرّر محمية وطنية (التنوع البيئي)"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "حصاة"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "حرّر حصاة"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "هوّة"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "أشجار منخفضة"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "حرّر أشجار منخفضة"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr ""
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "حرّر أرض بور"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "شجرة"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "حرّر شجرة"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "حرّر اإسم النباتي"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "حرج"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "حرّر حرج"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "صنوبري الثمر"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr ""
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "مختلط"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "غابة"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "حرّر غابة"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "محمية طبيعية"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "حرّر محمية طبيعية"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "حصاة"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "حرّر حصاة"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "أشجار منخفضة"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "حرّر أشجار منخفضة"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "هوّة"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr ""
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "حرّر أرض بور"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -29124,45 +29672,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -29170,25 +29718,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29196,10 +29744,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "شائع"
@@ -29207,20 +29755,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -29228,5 +29776,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -29234,15 +29782,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -29250,9 +29798,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -29260,39 +29808,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -29300,15 +29848,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -29316,52 +29864,182 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "المعلومات"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "عناوين"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "حرّر معلومات عنوان"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "رقم المنزل"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "تسمية المنزل"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "إسم الشارع"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "إسم المدينة"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "الرمز البريدي"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "رمز البلد"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+msgid "AT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "ش."
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "IT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "ج."
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "حرّر إستيفاء العنوان"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "مخطط الترقيم"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "مفرد"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "مثنى"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "التناقض"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "أضف معلومات عن المؤلف"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "صورة"
 
 #. item "Relations/Multipolygon"
@@ -29369,5 +30047,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -29379,5 +30057,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "الفلق الخارجي"
@@ -29385,5 +30063,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -29391,5 +30069,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29400,5 +30078,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29406,36 +30084,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29443,5 +30121,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -29450,5 +30128,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -29456,34 +30134,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -29492,15 +30170,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "إلى الطريق"
@@ -29508,5 +30186,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "الطريق"
@@ -29515,5 +30193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -29521,132 +30199,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "نوع الطريق"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr ""
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29714,5 +30281,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29722,9 +30289,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29738,10 +30305,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -29749,31 +30316,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -29782,30 +30349,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -33783,7 +34350,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -33905,9 +34471,12 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
 
+#~ msgid "Waterway Point"
+#~ msgstr "نقطة مجرى ماء"
+
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
@@ -33957,7 +34526,4 @@
 #~ msgid "Email"
 #~ msgstr "البريد الإلكتروني"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "إتصل بــ {0}..."
 
 #~ msgid "Only two nodes allowed"
@@ -34140,13 +34706,4 @@
 #~ msgid "current delta: {0}s"
 #~ msgstr "الإنحراف الحالي: {0}ث"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "صورة"
-#~ msgstr[1] "صورتين"
-#~ msgstr[2] "صور"
-#~ msgstr[3] "صورة"
-#~ msgstr[4] "صور"
-#~ msgstr[5] "صور"
 
 #~ msgid "Conflicting relation"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 22859)
+++ applications/editors/josm/i18n/po/bg.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-13 23:13+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 01:48+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-08-20 19:13+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Внимание"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Редактор"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -238,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -277,5 +277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -300,5 +300,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -409,4 +409,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -424,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1048,5 +1049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1066,5 +1067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1450,13 +1451,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1465,5 +1466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1471,9 +1472,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1481,5 +1482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1513,8 +1514,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1523,9 +1524,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1541,6 +1542,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1550,5 +1551,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1573,6 +1574,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Грешка"
@@ -1735,5 +1736,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Не, изход"
@@ -2022,5 +2023,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2491,5 +2492,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2530,9 +2531,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2541,9 +2542,9 @@
 "най-близката точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпуснете бутона на мишката за да спрете въртенето."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2810,5 +2811,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Търсене"
@@ -3006,7 +3007,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3276,5 +3277,5 @@
 msgstr[1] "Преместване {0} възела"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3432,31 +3433,31 @@
 msgstr "Автоматично поправяне на маркерите"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3475,15 +3476,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Грешка в конфигурационния файл на линии {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3494,5 +3495,5 @@
 "предпочитания ''{0}'' не е директория."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3503,5 +3504,5 @@
 "предпочитания ''{0}'' не е директория."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3512,5 +3513,5 @@
 "на липсваща директория за параметри: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3521,5 +3522,5 @@
 "липсваща директория за параметри: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3527,5 +3528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3534,5 +3535,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3541,5 +3542,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3548,5 +3549,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3555,10 +3556,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3680,5 +3681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3750,9 +3751,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Примитив с ID = 0 не може да бъде невидим."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3760,5 +3761,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3948,14 +3949,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарска Мрежа (Швейцария)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Север"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "юг"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Прескочи там"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3980,9 +4000,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4027,5 +4047,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "железопътна линия"
@@ -4046,5 +4066,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4299,69 +4319,69 @@
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/път/към/папката/на/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4371,9 +4391,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4381,57 +4401,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Инициализиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Настройки по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Дебитни карти"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Настройката {0} беше премахната тъй като вече не се използва."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4441,9 +4470,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4457,9 +4486,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4581,23 +4611,23 @@
 msgstr "Потребител:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "слоя не е в списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слоя ''{0}'' трябва да бъде в списъка от слоеве"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4689,5 +4719,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4695,17 +4725,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4715,25 +4745,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5131,4 +5161,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5211,4 +5242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5225,4 +5257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5296,5 +5329,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5306,10 +5339,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "няма/никой"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "всички"
@@ -5391,5 +5424,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5401,5 +5434,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5434,17 +5467,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Роля:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5452,15 +5485,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Ключ:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5468,10 +5501,10 @@
 msgstr "Стойност:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5483,5 +5516,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5493,5 +5526,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Приложи тази роля към всички членове"
@@ -5634,5 +5667,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5745,5 +5778,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5751,5 +5784,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5757,5 +5790,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5763,5 +5796,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5769,5 +5802,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5776,5 +5809,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5782,5 +5815,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5788,5 +5821,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5794,24 +5827,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5832,5 +5865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5855,37 +5888,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Въведете координати за новата точка."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Използване на десетични градуси."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Отрицателни стойности обозначават западното/южното полукълбо"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Въведете геогр. ширина в диапазона [-90 .. 90]"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Въведете валидна геогр. дължина в диапазона [-180 .. 180]"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Въведете геогр. дължина в диапазона [-180 .. 180]"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5941,9 +5974,9 @@
 msgstr "Информация за слоя"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Връзки"
@@ -5991,10 +6024,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6014,37 +6047,37 @@
 msgstr "Отваряне на списък с избрани обекти."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Мащабиране по селекцията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Мащабирай до избрания(те) елемент(и)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6053,27 +6086,27 @@
 msgstr "Избор"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Избрано: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Отсъедини панела"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6082,5 +6115,5 @@
 "левия панел."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Намаляване/увеличаване на панела"
@@ -6357,13 +6390,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6475,4 +6508,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6491,6 +6528,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6508,8 +6543,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6520,4 +6562,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6532,33 +6580,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6582,12 +6619,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6659,10 +6706,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6692,8 +6743,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6756,6 +6803,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6808,4 +6853,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6870,32 +6927,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6904,6 +6969,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6912,24 +6979,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6944,82 +7001,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7100,155 +7157,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Име"
@@ -7672,4 +7734,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<различни>"
@@ -8176,17 +8239,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "включително непосредствените наследници на родителските релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Зареди родителските релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Зареждане на родителските релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8465,4 +8528,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8470,15 +8534,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Тип"
@@ -8497,16 +8561,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "неизвестно"
@@ -9086,5 +9150,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9308,20 +9372,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Слой / Ниво"
@@ -9779,5 +9843,63 @@
 msgstr[1] "{0} обекта за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Описание"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Дължина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрути, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} точка на интерес"
+msgstr[1] "{0} точки на интерес"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9785,62 +9907,17 @@
 msgstr "GPS точка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Описание"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Дължина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} маршрут, "
-msgstr[1] "{0} маршрути, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} точка на интерес"
-msgstr[1] "{0} точки на интерес"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} етикет"
+msgstr[1] "{0} етикета"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9850,10 +9927,10 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9864,7 +9941,7 @@
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9872,10 +9949,10 @@
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9883,10 +9960,10 @@
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9894,21 +9971,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9920,9 +9997,9 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9932,5 +10009,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9940,30 +10017,30 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Използвай глобалните настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Чертай линии между точките на този слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Не чертай линии между точките на този слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Избиране варианти за чертане на линиите."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9971,5 +10048,5 @@
 msgstr "Избор цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9978,5 +10055,5 @@
 msgstr "По подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9985,18 +10062,18 @@
 msgstr "Изберете цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Маркери от наименувани точки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Наименувани точки от следа от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Импорт Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10006,23 +10083,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave аудио файлове (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудио маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Импорт на изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10464,15 +10541,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Без изображение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Зареждане {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11430,4 +11507,48 @@
 msgid "Voice recorder calibration"
 msgstr "Калибровка на звукозаписа"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Продължителност на встъплението (секунди)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Текущата стойност е ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "При запис, оставяй резервни копия на файловете завършващи с ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11512,5 +11633,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Автомобил"
@@ -11529,16 +11650,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Вело"
@@ -11572,12 +11693,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Пеш"
@@ -11839,18 +11960,18 @@
 msgstr "По подразбиране (Автоматично определени)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Използване на вградените настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Използван стил"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12169,26 +12290,18 @@
 "Проекцията {0} не може да бъде активирана. Използва се меркаторска проекция."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12304,6 +12417,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "алтернативен"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12520,12 +12642,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Съхраняване резервни копия"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "При запис, оставяй резервни копия на файловете завършващи с ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12705,5 +12819,5 @@
 msgstr "Добавяне на нов етикет"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12712,49 +12826,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Повече информация за тази възможност"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Незадължителни Атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестен тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12764,15 +12878,15 @@
 msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Грешка при разбор {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи от тип {0} се поддържат."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12782,17 +12896,17 @@
 msgstr[1] "Промяна {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Нищо не е избрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Селекцията е неподходяща!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Прилагане шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13400,5 +13514,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13496,5 +13610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13503,5 +13617,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13570,5 +13684,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13578,10 +13692,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13589,5 +13703,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13595,5 +13709,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13601,5 +13715,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -13608,5 +13722,5 @@
 "<relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13614,5 +13728,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13620,5 +13734,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13626,5 +13740,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13633,10 +13747,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Непълна спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13644,9 +13758,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13654,11 +13768,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Недопустим обект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13670,8 +13784,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13685,5 +13799,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13691,5 +13805,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13698,6 +13812,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13709,6 +13823,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13717,5 +13831,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13723,5 +13837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13729,12 +13843,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13742,5 +13856,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13750,5 +13864,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13758,5 +13872,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13764,17 +13878,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Подготвяне на базата данни ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14277,11 +14391,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14290,16 +14404,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14308,5 +14422,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14327,13 +14441,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Не прави нищо"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Съобщаване за грешка"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14342,9 +14456,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Неочаквана грешка"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14352,5 +14466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14358,5 +14472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14365,5 +14479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14371,9 +14485,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Текста вече е кипиран в буфера за обмен на данни)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14570,5 +14684,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14621,5 +14735,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14633,5 +14747,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14641,5 +14755,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14650,5 +14764,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -14752,5 +14866,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Видимост"
@@ -14836,10 +14950,61 @@
 msgstr "Качване на следи на openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Работно време"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Промяна параметрите на {0} обект"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Изберете"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Път {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Инструмент: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Скорост"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -15011,51 +15176,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Не може да се добави точка извън пределите на света."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Параметърът ''{0}'' не трябва да е празен"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Параметърът ''{0}'' не трябва да е празен"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15154,16 +15321,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15177,5 +15336,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15288,5 +15447,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Сгради"
@@ -15523,5 +15682,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15951,8 +16110,4 @@
 msgstr "Изток"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Север"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16070,6 +16225,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Празен слой"
@@ -17453,5 +17608,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Обществен транспорт"
@@ -17495,49 +17650,54 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Пътни точки"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "зареждане данни от API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "Импортирани данни от {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "промяна на селекцията"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "промяна областта видима на екрана"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "ръчно потвърждаване на всички действия на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Разширение, което позволява JOSM да бъде управляван от други приложения."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Дистанционно"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Настройки на разширението за дистанционно управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17549,21 +17709,21 @@
 "за да се свързват с него."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Позволени действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Желаете ли да разрешите това?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Потвърждение на действието на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -17571,15 +17731,15 @@
 "URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Дистанционното управление получи заявка за зареждане на данни от API-то."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности на заявката: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17802,58 +17962,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Интерактивна карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Зареждане на квадрант"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Зареждане на всички квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Увеличаване на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Намаляне на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Изчистване на кеша"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "изображение "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "автомащабиране"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "автозараждане квадранти"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Настройки на разширение SlippyMap"
@@ -18142,11 +18302,10 @@
 msgstr "Разделяне на сграда"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Редактирай газопровод"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19229,5 +19388,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -19349,59 +19508,59 @@
 msgstr "Припокриващи се пътища / линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19894,143 +20053,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "нагоре"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Моля, въведете потребителско име"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Стълби за преминаване през ограда"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20050,7 +20206,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "многобой"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20144,12 +20299,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Избор с даденото търсене"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Пътни точки"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20166,9 +20319,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Възникна грешка"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20227,21 +20380,21 @@
 msgstr "Настройте позицията на избрания WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Изберете WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Начало на подравняването"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20252,5 +20405,5 @@
 msgstr "Сваляне на WMS квадранти от {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20259,5 +20412,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20265,10 +20418,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20279,24 +20432,24 @@
 "Това може да доведе до погрешни координати."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20311,17 +20464,17 @@
 "WMS въпреки всичко?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Да, дръпни изображенията"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Невалиден URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20330,58 +20483,82 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Запис на слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Четене на WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Автоматично сваляне"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Отворете празен WMS слой за да заредите данни от файл"
@@ -20450,10 +20627,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"Дистанционното управление получи заявка за импорт на данни от следния адрес "
-"URL:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20964,16 +21138,21 @@
 "преместите позицията (основен проблем между Java и таблети)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Показва OpenLayers фоново изображение"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Вкарва проблеми от OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20983,5 +21162,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20991,5 +21170,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20998,5 +21177,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21007,10 +21186,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21018,15 +21197,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21036,5 +21215,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21043,10 +21222,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21055,5 +21234,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21064,15 +21243,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21086,15 +21265,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21103,5 +21282,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21110,5 +21289,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21117,10 +21296,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21132,5 +21311,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21140,5 +21319,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21147,20 +21326,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21169,5 +21348,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21209,4 +21388,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21239,10 +21419,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Пътна Мрежа"
@@ -21253,5 +21433,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автомагистрала"
@@ -21260,5 +21440,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Редактиране автомагистрала"
@@ -21295,10 +21475,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Означение"
@@ -21312,8 +21492,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Брой платна"
@@ -21332,13 +21512,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорост (км/ч)"
@@ -21372,17 +21552,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Еднопосочна"
@@ -21419,17 +21599,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21463,17 +21643,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Тунел"
@@ -21504,17 +21684,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Просека"
@@ -21545,17 +21725,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Насип"
@@ -21563,5 +21743,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Автомагистрална връзка"
@@ -21570,5 +21750,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Редактиране автомагистрална връзка"
@@ -21576,5 +21756,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Автострада"
@@ -21583,5 +21763,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Редактиране автострада"
@@ -21591,6 +21771,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Магистрала"
@@ -21598,5 +21778,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Автострадна връзка"
@@ -21605,5 +21785,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Редактиране автострадна връзка"
@@ -21616,5 +21796,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Първокласен път / главна"
@@ -21623,5 +21803,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Редактиране първокласен път"
@@ -21629,10 +21809,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Връзка с първокласен път"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Редактиране връзка с първокласен път"
@@ -21644,5 +21824,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Второкласен път"
@@ -21652,5 +21832,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Редактиране второкалсен път"
@@ -21658,5 +21838,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Третокласен"
@@ -21666,5 +21846,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Редактиране третокласен път"
@@ -21676,5 +21856,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Некласифициран"
@@ -21684,5 +21864,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Редактиране некласифициран път"
@@ -21692,6 +21872,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21714,15 +21894,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -21734,5 +21914,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Улица"
@@ -21741,5 +21921,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Редактиране улица от населено място"
@@ -21759,12 +21939,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Пътна настилка"
@@ -21786,166 +21966,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "асфалтиран път"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "неасфалтиран път"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "асфалт"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "метал"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "павета"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "павиран път"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "чакъл"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "чакъл"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "сбито"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "трева"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "трева"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "пясък"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "земя"
@@ -21953,5 +22133,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Жилищна улица"
@@ -21960,5 +22140,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Редактиране жилищна улица"
@@ -21966,5 +22146,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Пешеходна улица"
@@ -21973,5 +22153,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Редактирай пешеходна улица"
@@ -21979,5 +22159,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Помощна улица"
@@ -21986,5 +22166,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Редактиране помощна улица"
@@ -21994,18 +22174,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Тип помощна улица"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "алея"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "автомобилен"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "паркинг"
@@ -22013,5 +22193,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Улица паркинг"
@@ -22021,10 +22201,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Редактиране улица паркинг"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Път (неизвестен тип)"
@@ -22033,5 +22213,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Редактиране път от неизвестен тип"
@@ -22039,14 +22219,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Пътен ремонт"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Редактиране пътен ремонт"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Пътен възел"
@@ -22062,5 +22242,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "кръгово"
@@ -22069,5 +22249,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Пътни ограничения"
@@ -22076,15 +22256,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Редактиране пътни ограничения"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Пътна такса"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Без изход"
@@ -22092,5 +22272,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Достъп"
@@ -22116,4 +22296,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22121,4 +22302,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22194,236 +22381,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "частен"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "разрешителен"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "селскостопански"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "не"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "да"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "предназначен"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "частен"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "с назначение"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "разрешителен"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "селскостопански"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "не"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "предназначен"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "лек камион (до 3.5т)"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Камион (над 3.5т)"
@@ -22438,10 +22632,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Кон"
@@ -22457,10 +22651,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Мотоциклет"
@@ -22475,19 +22670,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Автомобил"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Обществен транспорт"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорост (км/ч)"
@@ -22495,20 +22690,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Макс. маса (т)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Макс.височина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "макс.ширина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "макс.дължина (метри)"
@@ -22516,5 +22711,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Кръгово движение"
@@ -22525,5 +22720,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Редактиране пътен възел"
@@ -22543,10 +22738,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "автомагистрала"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Автомагистрална връзка"
@@ -22568,10 +22763,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "Автострадна връзка"
@@ -22593,10 +22788,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "главен / първокласен"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "Връзка с главен път"
@@ -22618,5 +22813,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22631,9 +22826,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "третокласен"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "Некласифициран"
@@ -22647,9 +22842,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "улица"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "Жилищна улица"
@@ -22693,10 +22888,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "служебна"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "Направлява автобуси"
@@ -22726,5 +22921,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22736,10 +22931,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Редактирай мост"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Редактиране тунел"
@@ -22747,10 +22942,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Пътища"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Черен път"
@@ -22759,35 +22954,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Редактирай черен път"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22795,5 +22990,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Пътека"
@@ -22802,76 +22997,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Редактирай пътека"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "за средно ниво"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ски"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Снегоход"
@@ -22880,5 +23075,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22886,5 +23081,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Редактиране алея за езда"
@@ -22892,5 +23087,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22908,11 +23103,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Редактиране велоалея"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Пешеходци"
@@ -22920,5 +23115,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22926,5 +23121,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22932,5 +23127,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22939,5 +23134,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Редактиране на алея или тротоар"
@@ -22945,5 +23140,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Стъпала"
@@ -22953,10 +23148,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Редактиране на: стълби"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Брой седящи места"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Магистрален възел"
@@ -22964,15 +23165,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Редактирай магистрален възел"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Услуги"
@@ -22980,5 +23181,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Редактирай служба услуги"
@@ -22986,10 +23187,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23018,36 +23220,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Оператор"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "поток"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Редактирай ресторант"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Телефон за спешен случай"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Светофар"
@@ -23057,5 +23280,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходна пътека"
@@ -23064,27 +23287,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "неконтролирано"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "светофар"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "немаркиран"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
@@ -23092,6 +23315,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Пресичане с велосипед"
@@ -23100,11 +23323,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Име на типа пътека (UK)"
@@ -23112,30 +23335,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "зебра"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "светофар контролиран от пешеходци"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Стоп"
@@ -23143,67 +23366,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Пешеходна пътека"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Редактиране на пресечно място или кръстовище"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Тип име (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Мини кръгово движение"
@@ -23214,14 +23375,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Посока"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "по часовниковата стрелка"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Пешеходна пътека"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Редактиране на пресечно място или кръстовище"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Тип име (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Обръщало"
@@ -23231,5 +23454,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Знак указващ начало/край на населено място"
@@ -23237,15 +23460,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Редактирай знак за ограничение в град"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Второ име"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Пътна камера"
@@ -23254,11 +23477,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Телефон за спешен случай"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Наклон"
@@ -23266,5 +23484,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Стръмен наклон"
@@ -23272,5 +23490,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23280,10 +23498,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Брод"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Редактирай брод"
@@ -23291,5 +23509,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Планински проход"
@@ -23297,5 +23515,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Редактирай планински проход"
@@ -23304,10 +23522,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -23315,5 +23533,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Прегради"
@@ -23321,5 +23539,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Стълб"
@@ -23327,5 +23545,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Редактиране на стълб"
@@ -23370,16 +23588,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Разрешено преминаване:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Вело бариера"
@@ -23388,5 +23606,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Бетонен блок"
@@ -23394,5 +23612,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Тексаска мрежа (препятствие за животни)"
@@ -23400,10 +23618,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Редактирай тексаска мрежа"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Бус трап"
@@ -23411,15 +23629,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Шипове"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Редактиране шипове"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Място за плащане пътна такса"
@@ -23427,5 +23645,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Редактирай място за плащане пътна такса"
@@ -23433,10 +23651,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Граничен контрол"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Редактирай граничен контрол"
@@ -23445,5 +23663,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Плет"
@@ -23454,22 +23672,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Ограда / стобор"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Стена"
@@ -23477,5 +23695,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Градска стена"
@@ -23484,5 +23702,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Подпорна стена"
@@ -23493,10 +23711,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Вход"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Редактирай вход"
@@ -23504,5 +23722,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Порта"
@@ -23510,50 +23728,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Редактирай порта"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Бариера"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Редактиране на \"бариера\""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Редактирай врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Накланяща преграда (bump gate)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Редактирай накланяща преграда"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Кисинг гейт (преграда срещу животни)"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Редактирай кисинг гейт"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Стълби за преминаване през ограда"
@@ -23561,25 +23779,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Редактиране на: стълби за преминаване през ограда"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "турникет (контрол на достъпа)"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "редактиране на: турникет"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Двойна врата"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Редактирай двойна врата"
@@ -23587,25 +23805,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Извор"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Редактирай извора"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Отточен канал"
@@ -23613,10 +23820,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Редактирай отточен канал"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23624,10 +23831,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Поток"
@@ -23635,10 +23842,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Редактирай поток"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Канал"
@@ -23646,10 +23853,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Редактирай канал"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Река"
@@ -23659,59 +23866,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Редактирай река"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Извор"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Редактирай извора"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Водопад"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Редактирай водопад"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Бент / преливник"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Редактирай бент / преливник"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Язовирна стена"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Редактирай язовирна стена"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Басейн"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Редактиране на басейн"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Резервоар"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Редактирай резервоар"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Закрит резервоар"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Редактирай закрит резервоар"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Редактирай водата"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Суша"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Редактирай сушата"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Басейн"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Редактиране на басейн"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Резервоар"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Редактирай резервоар"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Закрит резервоар"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Редактирай закрит резервоар"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Крайбрежие"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Редактирай крайбрежието"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Речен бряг"
@@ -23720,10 +23981,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Редактирай речен бряг"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Мочурище"
@@ -23734,14 +23996,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Редактирай мочурището"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "блато"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "тресавище"
@@ -23755,35 +24017,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "блато"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "тръстенак"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "солени блата / солници"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "приливно-отливно крайбрежие"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "мангрова гора"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Кал"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Редактирай калта"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Плаж"
@@ -23791,20 +24053,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Редактирай плажа"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Залив"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Редактирай залива"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Скала"
@@ -23812,145 +24074,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Редактирай скалата"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Крайбрежие"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Редактирай крайбрежието"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Пазаруване"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Ферибот терминал"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Редактирай ферибот терминал"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Автомобил"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "начинаещ"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "велосипед"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ферибот маршрут"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Ферибот"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Корабостроителница"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Редактирай корабостроителница"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Док"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Редактирай док"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Язовирна стена"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Редактирай язовирна стена"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Хидротехническо съоръжение"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Пристанище за яхти"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Редактирай пристанище за яхти"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Кей"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Редактирай кей"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Шлюзова врата"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Бент / преливник"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Редактирай бент / преливник"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Водопад"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Редактирай водопад"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Разширение за обръщане"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Пристанище за яхти"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Редактирай пристанище за яхти"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Кей"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Редактирай кей"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Ферибот терминал"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Редактирай ферибот терминал"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Хелинг"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23960,16 +24293,38 @@
 msgstr "Редактирай хелинг"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Корабостроителница"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Редактирай корабостроителница"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Док"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Редактирай док"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Железница"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "ЖП Линия"
@@ -23977,5 +24332,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Редактирай ЖП Линия"
@@ -24005,7 +24360,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24021,8 +24376,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24036,29 +24391,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "Депо"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "ЖП стрелка"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "скоростна"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24071,8 +24426,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24143,8 +24498,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24156,8 +24511,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Волтаж"
@@ -24170,8 +24525,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -24184,23 +24539,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Теснолинейка"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Редактирай теснолинейка"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Монорелса"
@@ -24208,50 +24563,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Редактирай монорелса"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Историческа ЖП линия"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Редактирай историческа ЖП линия"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Лека ЖП линия"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Редактирай лека ЖП линия"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Метро"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Редактирай метро"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Редактирай трамвай"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Направляван автобус"
@@ -24259,5 +24614,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Редактирай направляван автобус"
@@ -24266,10 +24621,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Неизползвана ЖП линия"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Редактирай неизползвана ЖП линия"
@@ -24278,9 +24633,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Незадължителни типове"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Изоставена ЖП линия"
@@ -24289,5 +24644,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Регулиран ЖП прелез"
@@ -24296,5 +24651,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "ЖП прелез"
@@ -24304,5 +24659,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Тип пресичане"
@@ -24310,5 +24665,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "ЖП Обръщаща платформа"
@@ -24317,5 +24672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24324,10 +24679,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Надземни линии"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Седалков лифт"
@@ -24335,10 +24690,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Редактирай седалков лифт"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Влек"
@@ -24346,10 +24701,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Редактирай влек"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Кабинков лифт"
@@ -24357,10 +24712,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Редактирай кабинков лифт"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Гондола"
@@ -24368,10 +24723,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Редактиране на гондола"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24380,5 +24736,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24386,5 +24742,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24393,5 +24749,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24399,5 +24755,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Бензиностанция"
@@ -24407,69 +24763,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Редактирай бензиностанция"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "земя"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24486,34 +24864,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24521,37 +24900,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Работно време"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24572,33 +24962,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24607,170 +24999,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "денонощно"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "магазин"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Хранителни стоки"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Будка"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Дизел"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Био дизел"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Бензин А91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Бензин А95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Бензин А98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "Бензин А100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24778,4 +25192,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24787,6 +25202,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Паркинг"
@@ -24795,5 +25210,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Редактирай паркинг"
@@ -24804,25 +25219,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Ref номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "на няколко нива"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "наземен"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "подземен"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24831,54 +25248,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Такса"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Капацитет (общ)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Места за инвалиди"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Запазени места за жени"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Запазени места за родители"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Автомивка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Редактирай автомивка"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Автомобили"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Редактирай автосалон"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Сервиз"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Редактирай автосервиз"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "да"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Редактирай дърво"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Свързване с {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Телефонен номер"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Под наем"
@@ -24887,10 +25448,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Редактиране коли под наем"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Споделяне на автомобили"
@@ -24898,28 +25458,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Редактирай споделяне автомобили"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Велосипедна стоянка (паркинг)"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Капацитет"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Мотоциклет"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Редактиране автомагистрала"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Услуги"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Запазване"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "земя"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Шаблони"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Дрехи"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Велосипедна стоянка (паркинг)"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Капацитет"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Велосипеди"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Редактирай вело-магазин"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Редактиране велосипеди под наем"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24929,5 +25548,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24935,5 +25554,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Референция"
@@ -24941,5 +25560,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Малка ЖП гара"
@@ -24947,5 +25566,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Редактирай малка ЖП гара"
@@ -24953,5 +25572,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Трамвайна спирка"
@@ -24960,5 +25579,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Редактирай трамвайна спирка"
@@ -24966,5 +25585,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "ЖП платформа"
@@ -24973,5 +25592,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Редактирай ЖП платформа"
@@ -24983,5 +25602,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Референция (коловоз #)"
@@ -24989,10 +25608,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Област"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -25001,10 +25620,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Редактирай вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -25013,5 +25632,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Автогара"
@@ -25020,5 +25639,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Редактирай автогара"
@@ -25026,5 +25645,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Автобусна спирка"
@@ -25034,13 +25653,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Редактирай автобусна спирка"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Навес"
@@ -25048,19 +25666,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Скамейка"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Редактирай автобусна платформа"
@@ -25068,5 +25686,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Такси"
@@ -25074,5 +25692,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Редактирай стоянка таксита"
@@ -25080,10 +25698,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Летище"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25091,5 +25709,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25097,10 +25715,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25109,5 +25727,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -25115,5 +25733,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -25121,5 +25739,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -25127,5 +25745,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -25133,5 +25751,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25139,5 +25757,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25147,5 +25765,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25155,5 +25773,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -25164,6 +25782,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -25173,5 +25791,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25180,5 +25798,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -25186,5 +25804,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -25192,15 +25810,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Пътуване"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -25212,5 +25830,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Хотел"
@@ -25219,5 +25837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Редактирай хотел"
@@ -25230,8 +25848,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Звезди"
@@ -25255,34 +25873,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25296,168 +25914,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "терминал"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Телефонен номер"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Мотел"
@@ -25465,20 +25988,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Бунгало"
@@ -25486,10 +26009,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -25497,30 +26020,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -25528,10 +26052,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -25542,5 +26066,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -25548,5 +26072,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
@@ -25554,5 +26078,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Кухня"
@@ -25560,79 +26086,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -25640,18 +26166,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25659,10 +26185,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Кафене"
@@ -25670,10 +26196,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Бар"
@@ -25681,20 +26212,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Бар"
@@ -25702,10 +26233,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -25713,25 +26244,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Музей"
@@ -25739,9 +26270,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -25750,9 +26281,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Развлекателен парк"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Редактирай развлекателен парк"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Творба на изкуството"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Редактирай творба на изкуството"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -25760,50 +26312,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Развлекателен парк"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Редактирай развлекателен парк"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Творба на изкуството"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Редактирай творба на изкуството"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Редактирай навес"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Огнище"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Място за пикник"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Редактирай място за излет"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Информационен пункт"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25841,5 +26394,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25847,28 +26400,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "място"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "град"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "район"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "По-подробно описание"
@@ -25878,5 +26431,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Показани са пътища за:"
@@ -25884,5 +26437,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -25890,6 +26443,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -25897,5 +26450,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Планинско колоездене"
@@ -25903,6 +26456,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Ски"
@@ -25910,5 +26463,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Колоездене"
@@ -25916,46 +26469,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... възможни са други способи за придвижване"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Съдържание на таблото"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "табела"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "дива природа"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Упътване"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25964,5 +26517,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Информационен пункт"
@@ -25970,55 +26523,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "По-точно описание"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Аудио напътствия"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Тел. номер"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Редактирай навес"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Огнище"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Място за пикник"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Редактирай място за излет"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Замък"
@@ -26027,19 +26559,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Руини"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -26048,9 +26580,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -26058,10 +26590,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -26069,5 +26601,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26075,15 +26607,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Паметник"
@@ -26091,55 +26623,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Пограничен камък"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "редактиране на: Пограничен камък"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Площадка"
@@ -26147,35 +26679,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -26189,6 +26721,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -26604,6 +27136,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26638,240 +27170,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Многобой"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -26888,5 +27420,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26913,23 +27444,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "тип"
@@ -26946,5 +27485,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26971,211 +27509,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "следа"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Моторни спортове"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Редактирай моторни спортове"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -27183,52 +27724,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Стрелба"
@@ -27236,204 +27777,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Моторни спортове"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Редактирай моторни спортове"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Внимание"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Редактирай паркинг"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Автомобил"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Редактирай моторни спортове"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Редактирай фигурно пързаляне"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Редактирай граничен контрол"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Автомобил"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Редактирай кабинков лифт"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Сграда"
@@ -27441,5 +28048,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -27447,10 +28054,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Кметство"
@@ -27458,10 +28065,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Посолство"
@@ -27469,10 +28076,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -27481,10 +28088,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Затвор"
@@ -27493,10 +28100,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -27506,10 +28113,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -27518,10 +28125,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -27529,5 +28136,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -27535,15 +28142,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Училище"
@@ -27551,10 +28158,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Университет"
@@ -27562,10 +28169,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Колеж"
@@ -27573,5 +28180,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -27579,5 +28186,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Кино"
@@ -27586,10 +28193,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Библиотека"
@@ -27598,9 +28205,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -27608,10 +28215,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Театър"
@@ -27620,10 +28227,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -27633,5 +28240,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -27640,6 +28247,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Религия"
@@ -27648,66 +28255,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Конфесия"
@@ -27716,189 +28323,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "Сунити"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Адреси"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Редактиране на информацията за адреса"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Номер"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Име на дом"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Име на улица"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Име на град"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Пощенски код"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Код на държава"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Редактирай интерполация на адреси"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Схема на номериране"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "нечетни"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "четни"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "по азбучен ред"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -27906,25 +28443,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -27932,10 +28469,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Мелница"
@@ -27943,10 +28480,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -27955,41 +28492,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Местоположение"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -27999,10 +28536,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Кран"
@@ -28010,5 +28547,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Редактирай кран"
@@ -28016,10 +28553,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -28027,10 +28564,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -28038,23 +28575,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -28064,35 +28601,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Електростанция"
@@ -28101,10 +28638,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -28113,5 +28650,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -28119,10 +28656,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -28133,23 +28670,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -28158,20 +28695,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28179,55 +28716,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Тоалетни"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Телефон"
@@ -28236,5 +28773,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -28242,5 +28779,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Монети"
@@ -28248,5 +28785,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Банкноти"
@@ -28254,5 +28791,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -28260,5 +28797,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -28266,15 +28803,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -28283,5 +28820,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -28289,35 +28826,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Консервни кутии"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Дрехи"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28325,5 +28857,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28332,31 +28864,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "кафяво"
@@ -28435,5 +28967,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28443,31 +28975,31 @@
 msgstr "зеленина"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "сиво"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -28475,31 +29007,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Фонтан"
@@ -28508,10 +29040,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -28520,10 +29052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Пожарен кран"
@@ -28532,5 +29064,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "редактиране на \"Пожарен кран\""
@@ -28538,501 +29070,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Пеш"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Супермаркет"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Редактирай супермаркет"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Хранителни стоки"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Редактиране на \"магазин за хранителни стоки\""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Будка"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Редактирай будка"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Месарница"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Редактирай месарница"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Фурна"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Редактирай фурна"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Био магазин"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Редактирай био магазин"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Алкохол"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Редактиране магазин за алкохол"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Напитки"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Редактиране магазин за безалкохолни"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Магазини"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Аптека"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Редактиране на: аптека"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Фризьорски салон / козметика"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Редактирай фризьорски салон / козметика"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Оптика"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Редактирай оптика"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Редактирай компютърен магазин"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Обувки"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Редактирай магазин за обувки"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Туристически стоки (за активен отдих)"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Редактирай мазизин за туристически стоки"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Редактирай магазин за спортни стоки"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Химическо чистене"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Редактирай химическо чистене"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Пералня"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Редактирай пералня"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "ЖП railover"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Редактирай ЖП Линия"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Компютри"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Редактирай компютърен магазин"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Електроника"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Редактирай магазин за електроника"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Аудио HiFi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Редактирай магазин за Аудио HiFi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Видео"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Редактирай Видео-магазин"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Цветарски магазин"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Редактирай цветарски магазин"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Градински център"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Редактирай градински център"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Железария"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Редактирай железария"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Магазин \"Направи си сам\""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Редактирай магазин \"Направи си сам\""
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Мебелен магазин"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Редактирай мебелен магазин"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Книжарница"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Редактирай книжарница"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Книжарница"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Редактиране на книжарница"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Туристическа агенция"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Редактиране на туристическа агенция"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Играчки"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Редактирай магазин за играчки"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Автомат за стоки"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Редактирай автомат за стоки"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Продукти за автоматична продажба"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "билети за обществен транспорт"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "карта на обществен транспорт"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "билети за паркиране"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "храна"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "напитки"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "сладки"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "цигари"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "фотографии"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "храна за животни"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "вестници"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "играчки"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "пощенски марки"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-карти"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "телефонни ваучери"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "ваучери"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "презервативи"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "тампони"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "торби за екскременти"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "клиентски карти"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Пари"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Банка"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Редактирай банка"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Банкомат"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Обмяна на валута"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Редактирай обмяна на валута"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Редактирай банкомат"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Здраве"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Лекар"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "редактиране на \"Лекар\""
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Стоматолог"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Редактирай стоматолигия"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Аптека"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Редактирай аптека"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Приготвят лекарства по рецепти"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Болница"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Редактирай болница"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Магазини"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Автомобили"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Редактирай автосалон"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Велосипеди"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Редактирай вело-магазин"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Супермаркет"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Редактирай супермаркет"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Аптека"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Редактиране на: аптека"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Хранителни стоки"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Редактиране на \"магазин за хранителни стоки\""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Будка"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Редактирай будка"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Книжарница"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Редактиране на книжарница"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Туристическа агенция"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Редактиране на туристическа агенция"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Месарница"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Редактирай месарница"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Фурна"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Редактирай фурна"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Цветарски магазин"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Редактирай цветарски магазин"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Био магазин"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Редактирай био магазин"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Алкохол"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Редактиране магазин за алкохол"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Напитки"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Редактиране магазин за безалкохолни"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Компютри"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Редактирай компютърен магазин"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Електроника"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Редактирай магазин за електроника"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Аудио HiFi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Редактирай магазин за Аудио HiFi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Мебелен магазин"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Редактирай мебелен магазин"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Градински център"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Редактирай градински център"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Железария"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Редактирай железария"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Магазин \"Направи си сам\""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Редактирай магазин \"Направи си сам\""
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Книжарница"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Редактирай книжарница"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Фризьорски салон / козметика"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Редактирай фризьорски салон / козметика"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Обувки"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Редактирай магазин за обувки"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Играчки"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Редактирай магазин за играчки"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Видео"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Редактирай Видео-магазин"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Химическо чистене"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Редактирай химическо чистене"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Пералня"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Редактирай пералня"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Туристически стоки (за активен отдих)"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Редактирай мазизин за туристически стоки"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Редактирай магазин за спортни стоки"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Оптика"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Редактирай оптика"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Автомат за стоки"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Редактирай автомат за стоки"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Продукти за автоматична продажба"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "билети за обществен транспорт"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "карта на обществен транспорт"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "билети за паркиране"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "храна"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "напитки"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "сладки"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "цигари"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "фотографии"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "храна за животни"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "вестници"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "играчки"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "пощенски марки"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-карти"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "телефонни ваучери"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "ваучери"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "презервативи"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "тампони"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "торби за екскременти"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "клиентски карти"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Пари"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Банка"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Редактирай банка"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Банкомат"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Обмяна на валута"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Редактирай обмяна на валута"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Редактирай банкомат"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Здраве"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Лекар"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "редактиране на \"Лекар\""
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Стоматолог"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Редактирай стоматолигия"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Аптека"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Редактирай аптека"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Приготвят лекарства по рецепти"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Болница"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Редактирай болница"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -29041,5 +29575,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -29048,15 +29582,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -29064,5 +29598,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -29071,368 +29605,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Граници"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Национална"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Редактирай национална граница"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Административна"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Редактирай административна граница"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Гражданска"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Редактирай гражданска граница"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Политическа"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Редактирай политическа граница"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Национален парк"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Редактирай граница национален парк"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Места"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Континент"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Държава"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Област/Щат"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Област"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Редактирай област"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Графство"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Редактирай графство"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Град (над 100 000)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Град (под 100 000)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Редактирай град"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Квартал/предградие"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Село"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Редактирай село"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Махала"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Местност"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Връх"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Редактиране връх"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Ледник"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Редактиране ледник"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Вулкан"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Редактиране вулкан"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Пещерен вход"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Редактиране пещерен вход"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Остров"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Скала"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "природа"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Дърво"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Редактирай дърво"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Ботаническо название"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Гора"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "редактиране на \"гора\""
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "иглолистен"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "широколистен"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "смесен"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Гора"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "редактиране на \"залесена площ\""
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Природен резерват"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Редактирай природен резерват"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Пещерен вход"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Редактиране пещерен вход"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Връх"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Редактиране връх"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Ледник"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Редактиране ледник"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Вулкан"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Редактиране вулкан"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Граници"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Национална"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Редактирай национална граница"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Административна"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Редактирай административна граница"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Гражданска"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Редактирай гражданска граница"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Политическа"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Редактирай политическа граница"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Национален парк"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Редактирай граница национален парк"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Сипей"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Редактирай сипей"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Скалист склон"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Редактирай скалист склон"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Шубрак"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Редактирай шубрака"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Пустош"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Редактиране пустош"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Дърво"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Редактирай дърво"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Ботаническо название"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Гора"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "редактиране на \"гора\""
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "иглолистен"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "широколистен"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "смесен"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Гора"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "редактиране на \"залесена площ\""
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Природен резерват"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Редактирай природен резерват"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Сипей"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Редактирай сипей"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Шубрак"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Редактирай шубрака"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Скалист склон"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Редактирай скалист склон"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Пустош"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Редактиране пустош"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -29441,45 +29981,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -29487,25 +30027,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Зелено село"
@@ -29513,10 +30053,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Общи"
@@ -29524,20 +30064,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -29545,5 +30085,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -29551,15 +30091,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -29567,9 +30107,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Гробище"
@@ -29577,39 +30117,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -29617,15 +30157,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -29633,52 +30173,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Гара / Спирка"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Адреси"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Редактиране на информацията за адреса"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Номер"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Име на дом"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Име на улица"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Име на град"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Пощенски код"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Код на държава"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "С"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "И"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "З"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "Ю"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Редактирай интерполация на адреси"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Схема на номериране"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "нечетни"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "четни"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "по азбучен ред"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Конфликт"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Добави информация за автора"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Изображение"
 
 #. item "Relations/Multipolygon"
@@ -29686,5 +30359,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -29696,5 +30369,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "външен сегмент"
@@ -29702,5 +30375,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -29708,5 +30381,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29717,5 +30390,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29723,36 +30396,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29760,5 +30433,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -29767,5 +30440,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -29773,34 +30446,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "само направо"
@@ -29809,15 +30482,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "до път"
@@ -29825,5 +30498,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Маршрут"
@@ -29832,5 +30505,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -29838,132 +30511,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Тип маршрут"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "велосипед"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ски"
@@ -30031,5 +30593,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30039,9 +30601,9 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "обиколка"
@@ -30055,10 +30617,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -30066,31 +30628,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -30099,30 +30661,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -34100,7 +34662,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34222,8 +34783,14 @@
 msgstr "Сицилия - Италия"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Съхраняване резервни копия"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Хидротехническо съоръжение"
 
 #~ msgid ""
@@ -34419,7 +34986,4 @@
 #~ msgstr[0] "изображение"
 #~ msgstr[1] "изображения"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
 
 #~ msgid "{0} within the track."
@@ -34959,7 +35523,4 @@
 #~ msgstr "Зареди избраното"
 
-#~ msgid "Contact {0}..."
-#~ msgstr "Свързване с {0}..."
-
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Грешка на разбор от URL: \"{0}\""
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 22859)
+++ applications/editors/josm/i18n/po/cs.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-17 19:44+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-23 10:16+0000\n"
 "Last-Translator: Jezevec <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:15+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Varování"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -410,4 +410,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -425,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1047,5 +1048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1054,5 +1055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1065,5 +1066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1454,13 +1455,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1469,5 +1470,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1475,9 +1476,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1485,5 +1486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1517,8 +1518,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1527,9 +1528,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1545,6 +1546,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1554,5 +1555,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1577,6 +1578,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Chyba"
@@ -1739,5 +1740,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Ne, zrušit"
@@ -2028,5 +2029,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2085,4 +2086,6 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
+"<html>Data, která chcete nahrát obsahují nevyřešené konflikty ve vrstvě "
+"''{0}''.<br>Je třeba je nejprve vyřešit.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
@@ -2497,5 +2500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2540,9 +2543,9 @@
 "Opravdu přesunout?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2550,9 +2553,9 @@
 "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusťte myší tlačítko k zastavení otaáčení"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2829,5 +2832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Hledat"
@@ -3027,7 +3030,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3300,5 +3303,5 @@
 msgstr[2] "Přesunout uzly {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3459,31 +3462,31 @@
 msgstr "Automatická korekce popisků"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3502,15 +3505,15 @@
 msgstr "Neplatná zeměpisná délka ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Poškozený konfigurační soubor na řádku {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3521,5 +3524,5 @@
 "adresářem."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3528,5 +3531,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3535,5 +3538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3542,5 +3545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3548,5 +3551,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3555,5 +3558,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3562,5 +3565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3569,5 +3572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3576,10 +3579,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3702,5 +3705,5 @@
 msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3772,9 +3775,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3782,5 +3785,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3973,15 +3976,34 @@
 msgstr "PUWG 2000 Zóna {0} (Polsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Švýcarský Grid"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Zóna UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Sever"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "jih"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Skočit tam"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4005,9 +4027,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4050,5 +4072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "železnice"
@@ -4069,5 +4091,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4324,69 +4346,69 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Nastavit jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/ADRESARI/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Změnit adresář pro všechna uživatelská nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4396,9 +4418,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4408,57 +4430,70 @@
 "pořadí."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Inicializace"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Aktualizuji pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Instaluji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debetní karty"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+"JOSM nalezl {0} neuložených datových vrstev. Vypadá to, že JOSM byl "
+"neočekávaně ukončen. Chcete data obnovit?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4468,9 +4503,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4484,9 +4519,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4608,23 +4644,23 @@
 msgstr "Uživatel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4722,5 +4758,5 @@
 msgstr "Klikněte pro uzavření dialogu a zrušení mazání objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4730,17 +4766,17 @@
 "přiblížení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Úroveň přiblížení:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "od dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "do dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4753,25 +4789,25 @@
 "alternativní formáty <i>přiblížení,x,y</i> nebo <i>přiblížení;x;y</i>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Adresa dlaždice:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Použít adresu dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Prosím vložte adresu dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Zadaná hodnota není adresou dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Prosím vložte identifikátor dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5186,4 +5222,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5266,4 +5303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5280,4 +5318,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5351,5 +5390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5361,10 +5400,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "nic"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "všechny"
@@ -5447,5 +5486,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5458,5 +5497,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5492,17 +5531,17 @@
 msgstr "Zatím nerozhodnuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Zadat roli všech členů relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5510,15 +5549,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Klíč:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5526,10 +5565,10 @@
 msgstr "Hodnota:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5546,5 +5585,5 @@
 "strong>: sloučená cesta zaujme místo původní cesty v relaci.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5556,5 +5595,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Aplikovat tuto roli na všechny členy"
@@ -5702,5 +5741,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5813,5 +5852,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5819,5 +5858,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5825,5 +5864,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5831,5 +5870,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5837,5 +5876,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5844,5 +5883,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5850,5 +5889,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5856,5 +5895,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5862,24 +5901,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtrování je aktivní</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektů skryto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objektů deaktivováno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5901,5 +5940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5924,37 +5963,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Zadejte souřadnice nového uzlu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Použijte desetinné stupně."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Prosím zadejte platnou zeměpisnou šířku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Prosím zadejte zeměpisnou šířku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Prosím zadejte platnou zeměpisnou délku v rozsahu -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Prosím zadejte zeměpisnou délku v rozsahu -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Zavřít dialog a vytvořit nový bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Zavřít dialog a nevytvořit nový bod"
@@ -6010,9 +6049,9 @@
 msgstr "Informace o vrstvě"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relace"
@@ -6060,10 +6099,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Stáhnout nekompletní členy vybraných relací"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Stáhnout nekompletní členy"
@@ -6083,37 +6122,37 @@
 msgstr "Otevřít okno s výběrem."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Hledat objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Přiblížit na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Přiblížit na zvolené prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Vyvolat editor na relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Vyvolat editor relací na vybranou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Vybrat relaci v seznamu relací."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6122,27 +6161,27 @@
 msgstr "Výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Výběr: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Prozkoumat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Vytrhnout panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6151,5 +6190,5 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
@@ -6431,13 +6470,13 @@
 msgstr "Není co přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Obsah této sady změn ještě nebyl stáhnut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Stáhnout nyní"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Stáhnout obsah sady změn"
@@ -6549,4 +6588,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6565,6 +6608,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6582,8 +6623,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6594,4 +6642,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6606,33 +6660,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6656,12 +6699,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6733,10 +6786,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6766,8 +6823,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6830,6 +6883,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6882,4 +6933,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6944,32 +7007,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6978,6 +7049,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6986,24 +7059,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7018,82 +7081,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7174,155 +7237,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Název"
@@ -7754,4 +7822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<různé>"
@@ -8276,17 +8345,17 @@
 msgstr "Varování: Ignoruji výjimku, protože úkol je přerušen. Výjimka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "včetně přímých potomků rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Načíst rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Nahrávám rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Upravit vybranou relaci"
@@ -8567,4 +8636,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8572,15 +8642,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Typ"
@@ -8599,16 +8669,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "neznámý"
@@ -9206,5 +9276,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9433,20 +9503,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Vrstva"
@@ -9934,11 +10004,6 @@
 msgstr[2] "{0} smazaných objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr "gps bod"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9946,5 +10011,6 @@
 msgstr "Jméno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9952,5 +10018,5 @@
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -9960,23 +10026,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr "Délka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
 msgstr "Délka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -9986,5 +10055,6 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -9994,10 +10064,24 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr "gps bod"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} tag"
+msgstr[1] "{0} tagy"
+msgstr[2] "{0} tagů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10007,10 +10091,10 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10021,7 +10105,7 @@
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10029,10 +10113,10 @@
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10040,10 +10124,10 @@
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10051,21 +10135,21 @@
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Stáhnout poblíž:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "pouze trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "pouze značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "trasy a značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10077,9 +10161,9 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10087,5 +10171,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10095,30 +10179,30 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Kreslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Nereslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10126,5 +10210,5 @@
 msgstr "Přizpůsobit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10133,5 +10217,5 @@
 msgstr "Výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10140,18 +10224,18 @@
 msgstr "Zvolit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pojmenované body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importovat zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10161,23 +10245,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import není možný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10626,15 +10710,15 @@
 msgstr "Soubor s obrázkem nebylo možné smazat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Žádný obrázek."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Nahrávám {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11595,4 +11679,48 @@
 msgid "Voice recorder calibration"
 msgstr "Kalibrace nahrávání zvuku"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Interval aktualizace (dnů):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Výchozí hodnota je''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Při ukládání zanechávat záložní soubory končící znakem ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Záložní soubory"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Konfigurace vytváření záložních souborů"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11677,5 +11805,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Auto"
@@ -11694,16 +11822,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Cyklisté"
@@ -11737,12 +11865,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Pěší"
@@ -11993,18 +12121,18 @@
 msgstr "Výchozí (automaticky)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Povolit vestavěné výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Povolit vestavěné standarní ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Použitý styl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Styly kreslení mapy"
@@ -12330,27 +12458,19 @@
 msgstr "Projekce {0} nemohla být aktivována. Používam Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Ověření"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Nastavení proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Záložní soubory"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Konfigurace používání proxy serveru"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Konfigurace vytváření záložních souborů"
 
 #. 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
@@ -12465,6 +12585,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternativní"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12691,12 +12820,4 @@
 "se ''Základní autentizace'."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Zanechávat záložní soubory"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Při ukládání zanechávat záložní soubory končící znakem ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12889,5 +13010,5 @@
 msgstr "Přidat nový tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12896,49 +13017,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Dostupné role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "počet"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12948,15 +13069,15 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12967,17 +13088,17 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13591,5 +13712,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13693,5 +13814,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13700,5 +13821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13768,5 +13889,5 @@
 msgstr "Soubor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13778,10 +13899,10 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13789,5 +13910,5 @@
 msgstr "Chybějící povinný atribut ''{0}'' na <nd> v cestě {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13795,5 +13916,5 @@
 msgstr "Neplatná hodnota atributu ''ref'' elementu <nd>. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13801,5 +13922,5 @@
 msgstr "Smazaná cesta {0} obsahuje uzly"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -13808,5 +13929,5 @@
 "<relation>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13814,5 +13935,5 @@
 msgstr "Chybějící atribut ''ref'' na členu v relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13820,5 +13941,5 @@
 msgstr "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13826,5 +13947,5 @@
 msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13834,10 +13955,10 @@
 "Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletní <member> specifikace s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13845,9 +13966,9 @@
 msgstr "Smazaná relace {0} obsahuje členy"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "V tagu chybí atribut \"key\" nebo \"value\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13855,11 +13976,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13871,8 +13992,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13886,5 +14007,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13892,5 +14013,5 @@
 msgstr "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13899,6 +14020,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13910,6 +14031,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13918,5 +14039,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13924,5 +14045,5 @@
 msgstr "Chybějící povinný atribut ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13930,12 +14051,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13943,5 +14064,5 @@
 msgstr "Smazaný uzel {0} je součástí cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13951,5 +14072,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13959,5 +14080,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13965,17 +14086,17 @@
 msgstr "Smazaný člen {0} je používán v relaci {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Zpracovávám OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Připravuji data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14493,11 +14614,11 @@
 msgstr "Stahuji seznam pluginů..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Stahuji seznam pluginů z ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14506,16 +14627,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14524,5 +14645,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14543,13 +14664,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Nedělat nic"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Nahlásit chybu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14558,9 +14679,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Neočekávaná výjimka"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14568,5 +14689,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14574,5 +14695,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14581,5 +14702,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14587,9 +14708,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Text již byl zkopírován do schránky.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14803,5 +14924,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14854,5 +14975,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14865,5 +14986,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14873,5 +14994,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14882,5 +15003,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)"
@@ -14981,5 +15102,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Viditelnost"
@@ -15065,10 +15186,61 @@
 msgstr "Nahraje trasy na openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Otevírací doba"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Změnit vlastnosti až  {0} objektu."
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Vybrat"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Cesta {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Nástroj: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "otevřený"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -15240,51 +15412,53 @@
 msgstr "Srovnat cesty"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Nemůžu přidat uzel ležící mimo Zemi."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Jsem připraven!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Režim rovnání cest"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Srovnat úsek cesty"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parametr ''{0}'' nesmí být null"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Jsem připraven!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "Režim rovnání cest"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "Srovnat úsek cesty"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parametr ''{0}'' nesmí být null"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15383,16 +15557,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15406,5 +15572,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "Toto již víckrát neukazovat"
@@ -15517,5 +15683,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Budovy"
@@ -15760,5 +15926,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16185,8 +16351,4 @@
 msgstr "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Sever"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16304,6 +16466,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
@@ -17687,5 +17849,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Hromadná doprava"
@@ -17729,48 +17891,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Silniční body"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "nahrání dat z API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "importovaná data z {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "vytváření nových objektů"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "změna výběru"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "změna pohledu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrzovat ručně všechny akce Dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňující ovládání JOSM z jiných aplikací."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Dálkové ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavení pro plugin \"Remote Control\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17782,34 +17949,34 @@
 "využívající tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Povolené akce"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Potvrdit akci dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požadavku: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17875,9 +18042,9 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Stahuji chybějící prvky"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Stahuji sadu změn"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18034,58 +18201,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Aktuální mapa"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Automatické přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Nahrát dlaždici"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Nahrát všechny dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Zvětšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Zmenšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Vyprázdnit cache dlaždic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "obrázek "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "automatické přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "automaticky stahovat dlaždice"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Nastavení pro plugin SlippyMap."
@@ -18373,11 +18540,10 @@
 msgstr "Řada domů"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Upravit potrubí"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19474,5 +19640,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19595,59 +19761,59 @@
 msgstr "Překrývající se cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Neznámý typ relace"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "Relace je prázdná"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<prázdné>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "Role {0} chybí"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Problém při kontrole rolí"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "Počet rolí {0} je příliš nízký ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "Počet rolí {0} je příliš vysoký ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "Role {0} neznáma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "Nalezena prázdná role"
@@ -20131,143 +20297,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "nahoru"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Prosím vložte identifikátor dlaždice"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Schůdky přes ohrazení"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20287,7 +20450,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "kombinovaný"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20385,7 +20547,6 @@
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Silniční body"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20402,9 +20563,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Nastala výjimka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Není v cache"
@@ -20463,21 +20624,21 @@
 msgstr "Upravit pozici zvolené WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Prosíme vyberte WMS vrstvu k upravení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Vybrat WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Začít upravování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Nejsou žádné WMS vrstvy k upravování."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Žádné vrstvy k upravování"
@@ -20488,5 +20649,5 @@
 msgstr "Stahovat WMS dlaždice z {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20496,5 +20657,5 @@
 "Varování: Základní URL WMS služby ''{0}'' neobsahuje ukončovací '&' nebo '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20502,10 +20663,10 @@
 msgstr "Varování: Stahování dlaždic WMS selhává. Prosím prověřte nastavení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Upozornění: Úplné URL je ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20516,5 +20677,5 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20523,19 +20684,19 @@
 "url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20550,17 +20711,17 @@
 "znovu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Ano, stahovat obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Neplatné URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20568,58 +20729,83 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Nastavit záložku WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Nelze zapsat čas modifikace."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
@@ -20688,8 +20874,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21202,16 +21387,21 @@
 "tablet problém)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje problémy z OpenStreetBugs."
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21220,5 +21410,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21227,5 +21417,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21234,5 +21424,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21243,10 +21433,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21254,15 +21444,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Plugin pro vracení sad změn zpět (revert)"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21272,5 +21462,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21281,10 +21471,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21293,5 +21483,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21302,15 +21492,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21320,15 +21510,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21337,5 +21527,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21346,5 +21536,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21355,10 +21545,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Umožňuje obnovování smazaných objektů z OSM databáze"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21369,5 +21559,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21377,5 +21567,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21386,20 +21576,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Vyberte sekvenci nevětvících se spojených cest"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21408,5 +21598,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21449,4 +21639,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21479,10 +21670,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Silniční síť"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Uliční a silniční síť"
@@ -21493,5 +21684,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Dálnice"
@@ -21500,5 +21691,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Upravit dálnici"
@@ -21535,10 +21726,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Číslo"
@@ -21552,8 +21743,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Jízdních pruhů"
@@ -21572,13 +21763,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -21612,17 +21803,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -21659,17 +21850,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21703,17 +21894,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunel"
@@ -21744,17 +21935,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Zářez"
@@ -21785,17 +21976,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Násep"
@@ -21803,5 +21994,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Dálnice - nájezd, rampa, kolektor"
@@ -21810,5 +22001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Upravit dálniční spojku"
@@ -21816,5 +22007,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Čtyřproudá silnice"
@@ -21823,5 +22014,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Upravit čtyřproudou silnici"
@@ -21831,6 +22022,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Silnice pro motorová vozidla"
@@ -21838,5 +22029,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Čtyřproudá silnice - nájezd"
@@ -21845,5 +22036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Upravit čtyřproudou silnici - nájezd"
@@ -21856,5 +22047,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Silnice 1. třídy"
@@ -21863,5 +22054,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Upravit silnici 1. třídy"
@@ -21869,10 +22060,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Silnice 1. třídy - nájezd"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Upravit spojku silnice 1. třídy"
@@ -21884,5 +22075,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Silnice 2. třídy"
@@ -21892,5 +22083,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Upravit silnici 2. třídy"
@@ -21898,5 +22089,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Silnice 3. třídy"
@@ -21906,5 +22097,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Upravit silnici 3. třídy"
@@ -21916,5 +22107,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Silnice bez zařazení (mimo obec)"
@@ -21924,5 +22115,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Upravit místní silnici"
@@ -21932,6 +22123,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Výhybny"
@@ -21954,15 +22145,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -21974,5 +22165,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Místní komunikace (ulice)"
@@ -21981,5 +22172,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Upravit místní komunikaci (ulici)"
@@ -21999,12 +22190,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Povrch"
@@ -22026,166 +22217,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "zpevněný"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "nezpevněný"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "kov"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "Prales"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "dlažební kostky"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "dlažební kostky"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "štěrk"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "oblázky"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "zhutněná"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "tráva"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "písek"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "země"
@@ -22193,5 +22384,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -22200,5 +22391,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Upravit obytnou zónu"
@@ -22206,5 +22397,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Pěší zóna"
@@ -22213,5 +22404,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Upravit pěší zónu"
@@ -22219,5 +22410,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Účelová komunikace"
@@ -22226,5 +22417,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Upravit účelovou komunikaci"
@@ -22234,18 +22425,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Typ účelové komunikace"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "ulička"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "příjezdová cesta"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -22253,5 +22444,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -22261,10 +22452,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Editovat obslužnou silnici na parkovišti"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámý typ)"
@@ -22273,5 +22464,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Upravit cestu neznámého typu"
@@ -22279,14 +22470,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Komunikace ve výstavbě"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Upravit silnici ve stavbě"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Križovatka"
@@ -22302,5 +22493,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -22309,5 +22500,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Silniční omezení"
@@ -22316,15 +22507,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Upravit silniční omezení"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Poplatek"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá komunikace"
@@ -22332,5 +22523,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Přístup"
@@ -22356,4 +22547,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22361,4 +22553,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22434,236 +22632,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "soukromý"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "na povolení"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "zemědelská vozidla"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "ne"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "vyhrazený(preferovaný)"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "soukromý"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "na povolení"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "zemědelská vozidla"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "ne"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "vyhrazený(preferovaný)"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Zásobování"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladní vozidlo"
@@ -22678,10 +22883,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Kůň"
@@ -22697,10 +22902,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocykl"
@@ -22715,19 +22921,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Vozidla MHD"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. rychlost (km/h)"
@@ -22735,20 +22941,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnost (tun)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Max. výška (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Max. šířka (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Max. délka (metrů)"
@@ -22756,5 +22962,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Kruhový objezd"
@@ -22765,5 +22971,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Upravit křižovatku"
@@ -22783,10 +22989,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "dálnice"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Dálnice - nájezd"
@@ -22808,10 +23014,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "čtyřproudá silnice"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "čtyřproudá silnice - nájezd"
@@ -22833,10 +23039,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "silnice první třídy"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "Silnice 1. třídy - nájezd"
@@ -22858,5 +23064,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22871,9 +23077,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "silnice třetí třídy"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "silnice bez klasifikace"
@@ -22887,9 +23093,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "obytná oblast"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "obytná zóna"
@@ -22933,10 +23139,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "obslužná cesta"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "Autobusová dráha"
@@ -22966,5 +23172,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22976,10 +23182,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Edituj most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Upravit tunel"
@@ -22987,10 +23193,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Lesní/polní cesta (track)"
@@ -22999,35 +23205,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Upravit vozovou cestu"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Typ cesty"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "stupeň 1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "stupeň 2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "stupeň 3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "stupeň 4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "stupeň 5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -23035,5 +23241,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Pěšina, vychozená cesta pro pěší/cyklo (path)"
@@ -23042,76 +23248,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Upravit cestu"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "vynikající"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "dobrá"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "špatná"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "příšerná"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Vozíky pro invalidy"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Lyže"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Sněžný skůtr"
@@ -23120,5 +23326,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Stezka pro koně"
@@ -23126,5 +23332,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Upravit cestu pro koně"
@@ -23132,5 +23338,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Cyklostezka"
@@ -23148,11 +23354,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Upravit cyklostezku"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Chodci"
@@ -23160,5 +23366,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Stezka pro pěší a cyklisty - dělená"
@@ -23166,5 +23372,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Stezka pro pěší a cyklisty - smíšená"
@@ -23172,5 +23378,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Chodník, pěší stezka"
@@ -23179,5 +23385,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Upravit chodník nebo stezku"
@@ -23185,5 +23391,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Schody"
@@ -23193,10 +23399,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Upravit schody"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Počet sedadel"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Dálniční sjezd (exit)"
@@ -23204,15 +23416,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Upravit křižovatku dálnic"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Služby motoristům (odpočívadla)"
@@ -23220,5 +23432,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Upravit služby motoristům (odpočívadla)"
@@ -23226,10 +23438,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23258,36 +23471,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operátor"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "potok"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Upravit restauraci"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Nouzový telefon"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semafory"
@@ -23297,5 +23531,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Typ přechodu pro chodce"
@@ -23304,27 +23538,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "volný"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "světelná signalizace"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "ostrov"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -23332,6 +23566,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -23340,11 +23574,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Dohled nad přechodem"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Typ přechodu (UK)"
@@ -23352,30 +23586,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra (bez semaforů)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelikán (se semafory)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "papuchalk"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tygr"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -23383,67 +23617,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Přechod pro chodce"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Upravit přechod"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Jméno typu (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Zpomalovací retardér"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Upravit zpomalovací retardér"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Výhybna"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Upravit výhybnu"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objezd"
@@ -23454,14 +23626,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Směr"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "po směru hodinových ručiček"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Přechod pro chodce"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Upravit přechod"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Jméno typu (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Zpomalovací retardér"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Upravit zpomalovací retardér"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Výhybna"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Upravit výhybnu"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Obratiště"
@@ -23471,5 +23705,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Značka hranice sídla (rychlostní limit)"
@@ -23477,15 +23711,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Upravit značka hranice sídla (rychlostní limit)"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Druhé jméno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
@@ -23494,11 +23728,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Nouzový telefon"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Stoupání"
@@ -23506,5 +23735,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Prudké stoupání"
@@ -23512,5 +23741,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Zásobník písku (pro posyp)"
@@ -23520,10 +23749,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Brod"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Upravit brod"
@@ -23531,5 +23760,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Horský průsmyk"
@@ -23537,5 +23766,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Upravit horský průsmyk"
@@ -23544,10 +23773,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -23555,5 +23784,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Bariéry"
@@ -23561,5 +23790,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Sloupek"
@@ -23567,5 +23796,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Upravit sloupek"
@@ -23610,16 +23839,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Zábrana proti kolům"
@@ -23628,5 +23857,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Zátarasa"
@@ -23634,5 +23863,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Mříž proti dobytku"
@@ -23640,10 +23869,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Editovat mříž proti dobytku"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Zábrana průjezdná pouze autobusem"
@@ -23651,15 +23880,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Jednosměrné hroty"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Editovat jednosměrné hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Mýtná budka"
@@ -23667,5 +23896,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Upravit mýtnou budku"
@@ -23673,10 +23902,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Hraniční kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Upravit hraniční kontrolu"
@@ -23685,5 +23914,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Živý plot"
@@ -23694,22 +23923,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Plot"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Zeď"
@@ -23717,5 +23946,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Městské hradby"
@@ -23724,5 +23953,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Opěrná zeď"
@@ -23733,10 +23962,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Upravit vstup"
@@ -23744,5 +23973,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Brána"
@@ -23750,50 +23979,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Editovat bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Editovat odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Brána otevíratelná nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Editovat bránu otevíratelnou nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Editovat průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -23801,25 +24030,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Editovat schůdky přes ohrazení"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Upravit turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Průchod se dvěma vraty"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Upravit průchod se dvěma vraty"
@@ -23827,25 +24056,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Vodstvo"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Pramen"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Upravit pramen"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Odvodňovací kanál, meliorace"
@@ -23853,10 +24071,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Strouha"
@@ -23864,10 +24082,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Upravit strouhu"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Potok"
@@ -23875,10 +24093,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -23886,10 +24104,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Řeka"
@@ -23899,59 +24117,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Upravit řeku"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Pramen"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Upravit pramen"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Vodopád"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Upravit vodopád"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Jez"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Upravit jez"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Hráz přehrady"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Upravit přehradu"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Vodní nádrž"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Upravit vodní nádrž"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Umělá vodní nádrž"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Upravit umělou vodní plochu"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Krytá vodní nádrž"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Upravit zakrytou umělou vodní plochu"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Upravit plochu země"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Vodní nádrž"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Upravit vodní nádrž"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Umělá vodní nádrž"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Upravit umělou vodní plochu"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Krytá vodní nádrž"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Upravit zakrytou umělou vodní plochu"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Linie pobřeží"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Upravit linii pobřeží"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -23960,10 +24232,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Mokřina"
@@ -23974,14 +24247,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "močál"
@@ -23995,35 +24268,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "rákosiny"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "přílivová oblast"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Bahno"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Pláž"
@@ -24031,20 +24304,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Útes"
@@ -24052,145 +24325,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Linie pobřeží"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Upravit linii pobřeží"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Nakupování"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Přístaviště přívozu"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Upravit přístaviště přivozu"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Auto"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "pro začátečníky (zelená)"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicykl"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Přívoz"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "doky"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Upravit doky"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dok"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Upravit dok"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Hráz přehrady"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Upravit přehradu"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Vodní objekty"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Přístav"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Upravit přístav"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Molo"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Upravit molo"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Plavební komora"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Jez"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Upravit jez"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Vodopád"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Upravit vodopád"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Rožšířené místo pro otáčení lodí"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Přístav"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Upravit přístav"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Molo"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Upravit molo"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Přístaviště přívozu"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Upravit přístaviště přivozu"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Skluz v loděnici"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24200,16 +24544,38 @@
 msgstr "Upravit skluz v loděnici"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "doky"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Upravit doky"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dok"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Upravit dok"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Doprava"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Železnice"
@@ -24217,5 +24583,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -24245,7 +24611,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Rozchod (mm)"
@@ -24261,8 +24627,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24276,29 +24642,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "seřazovací kolej"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "paralelní pomocná dráha"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "vlečka"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24311,8 +24677,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24383,8 +24749,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24396,8 +24762,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Napětí"
@@ -24410,8 +24776,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frekvence (Hz)"
@@ -24424,23 +24790,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnice"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upravit úzkorozchodnou železnici"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24448,50 +24814,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Upravit monorail"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Historická trať"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Upravit historickou trať"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Krátká/lehká trať"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Upravit krátká/lehká trať"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Upravit metro"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tramvaj"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Upravit tramvaj"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Autobusová dráha"
@@ -24499,5 +24865,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Upravit autobusovou dráhu"
@@ -24506,10 +24872,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnice"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Upravit nepoužívanou železnici"
@@ -24518,9 +24884,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Volitelné typy"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Snesená železnice (pouze žel. spodek)"
@@ -24529,5 +24895,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Železniční přejezd"
@@ -24536,5 +24902,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Železniční přechod pro chodce"
@@ -24544,5 +24910,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Druh křížení"
@@ -24550,5 +24916,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Točna"
@@ -24557,5 +24923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Zarážedlo"
@@ -24564,10 +24930,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -24575,10 +24941,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -24586,10 +24952,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Kyvadlová kabinková lanovka"
@@ -24597,10 +24963,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Upravit kyvadlovou kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Oběžná kabinková lanovka"
@@ -24608,10 +24974,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Upravit oběžnou kabinkovou lanovku"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24620,5 +24987,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24626,5 +24993,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24633,5 +25000,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24639,5 +25006,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -24647,69 +25014,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "země"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "Vzestupně"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24726,34 +25116,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24761,37 +25152,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Otevírací doba"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24812,33 +25214,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24847,170 +25251,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pá 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "S kioskem"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Samoobsluha, smíšenka, večerka"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosek"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Typy paliv:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Nafta"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bionafta"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 oktanů"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 oktanů"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 oktanů"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 oktanů"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% směs etanolu)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% směs etanolu)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (propan-butan)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (zemní plyn)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (motorka/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (motorka/moped)"
@@ -25018,4 +25444,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25027,6 +25454,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkoviště"
@@ -25035,5 +25462,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
@@ -25044,25 +25471,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Číslo záchodu"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "vícepodlažní"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "povrchové"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "podzemní"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Parkoviště P+R"
@@ -25071,54 +25500,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Poplatek"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Kapacita (celkem)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Místa pro vozíčkáře"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Místa pro ženy"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Místa pro rodiče"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Myčka"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Upravit myčku aut"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Prodejce automobilů"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Upravit obchod s auty"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Opravna"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Upravit autoopravnu"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "ano"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Upravit strom"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Obsah"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefonní číslo"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Půjčovna"
@@ -25127,10 +25700,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Upravit půjčovnu aut"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Sdílené vlastnictví vozidel"
@@ -25138,28 +25710,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "̈́Upravit sdílené vlastnictví vozidel"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Upravit parkoviště pro kola."
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Kapacita"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocykl"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Upravit dálnici"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Služby motoristům (odpočívadla)"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Měřítko"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "špatná"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Předvolby"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Oblečení"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Upravit parkoviště pro kola."
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Kapacita"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Prodejce kol"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Upravit prodejnu kol"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25169,5 +25800,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25175,5 +25806,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -25181,5 +25812,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Vlaková zastávka"
@@ -25187,5 +25818,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -25193,5 +25824,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -25200,5 +25831,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -25206,5 +25837,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Kolejové nástupiště (tram/vlak)"
@@ -25213,5 +25844,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Upravit kolejové nástupiště (tram/vlak)"
@@ -25223,5 +25854,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Číslo nástupiště"
@@ -25229,10 +25860,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Označit jako plochu"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -25241,10 +25872,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -25253,5 +25884,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -25260,5 +25891,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -25266,5 +25897,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -25274,13 +25905,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -25288,19 +25918,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Lavička"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -25308,5 +25938,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -25314,5 +25944,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Upravit stanoviště taxi"
@@ -25320,10 +25950,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Letiště"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25331,5 +25961,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25337,10 +25967,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25349,5 +25979,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Přistávací dráha (runway)"
@@ -25355,5 +25985,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Upravit přistávací dráhu"
@@ -25361,5 +25991,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Pojížděcí dráha (taxiway)"
@@ -25367,5 +25997,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Upravit pojížděcí dráhu"
@@ -25373,5 +26003,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25379,5 +26009,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25387,5 +26017,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Letištní plocha"
@@ -25395,5 +26025,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangár"
@@ -25404,6 +26034,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -25413,5 +26043,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Větrný pytel"
@@ -25420,5 +26050,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminál"
@@ -25426,5 +26056,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Upravit terminál"
@@ -25432,15 +26062,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Cestování"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -25452,5 +26082,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25459,5 +26089,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
@@ -25470,8 +26100,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Počet hvězdiček"
@@ -25495,34 +26125,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25536,168 +26166,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminál"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefonní číslo"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -25705,20 +26240,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Horská chata"
@@ -25726,10 +26261,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Hostel"
@@ -25737,30 +26272,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -25768,10 +26304,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -25782,5 +26318,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -25788,5 +26324,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -25794,5 +26330,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -25800,79 +26338,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -25880,18 +26418,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25899,10 +26437,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kavárna"
@@ -25910,10 +26448,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Hospoda"
@@ -25921,20 +26464,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -25942,10 +26485,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -25953,25 +26496,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Muzeum"
@@ -25979,9 +26522,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -25990,9 +26533,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Zábavní park"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Upravit zábavní park"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Umělecké dílo"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Upravit umělecké dílo"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -26000,50 +26564,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Zábavní park"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Upravit zábavní park"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Umělecké dílo"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Upravit umělecké dílo"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Upravit přístřešek"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Ohniště"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Místo na piknik"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Upravit místo na piknik"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Úroveň detailů"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topografická"
@@ -26081,5 +26646,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26087,28 +26652,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "orientační"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Zobrazený areál"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "místo"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "město"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -26118,5 +26683,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Trasy zobrazeny pro:"
@@ -26124,5 +26689,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -26130,6 +26695,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -26137,5 +26702,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Jízda na horském kole"
@@ -26143,6 +26708,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Lyžování"
@@ -26150,5 +26715,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Jízda na koni"
@@ -26156,46 +26721,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Obsah tabule"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "upozornění"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Rozcestník"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26204,5 +26769,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informační terminál"
@@ -26210,55 +26775,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audioprůvodce"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprůvodce přes mobilní telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Upravit přístřešek"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Ohniště"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Místo na piknik"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Upravit místo na piknik"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -26267,19 +26811,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -26288,9 +26832,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -26298,10 +26842,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Paleontologické naleziště"
@@ -26309,5 +26853,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Upravit paleontologické naleziště"
@@ -26315,15 +26859,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Památník"
@@ -26331,55 +26875,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Hraniční kameny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Upravit hraniční kameny"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Hřiště"
@@ -26387,35 +26931,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -26429,6 +26973,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -26844,6 +27388,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26878,240 +27422,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -27128,5 +27672,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27153,23 +27696,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "typ"
@@ -27186,5 +27737,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27211,211 +27761,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motorové sporty"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Upravit motorové sporty"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -27423,52 +27976,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Střelba"
@@ -27476,204 +28029,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motorové sporty"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Upravit motorové sporty"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Varování"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Upravit parkoviště"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Osobní automobily"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Upravit motorové sporty"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Upravit bruslení"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Upravit hraniční kontrolu"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Auto"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Upravit kyvadlovou kabinkovou lanovku"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Objekty a další POI"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Budova"
@@ -27681,5 +28300,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -27687,10 +28306,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Radnice"
@@ -27698,10 +28317,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -27709,10 +28328,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Soud"
@@ -27721,10 +28340,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Vězení"
@@ -27733,10 +28352,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Policie"
@@ -27746,10 +28365,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -27758,10 +28377,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Pošta"
@@ -27769,5 +28388,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -27775,15 +28394,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Základní škola"
@@ -27791,10 +28410,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Vysoká škola"
@@ -27802,10 +28421,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Střední škola"
@@ -27813,5 +28432,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -27819,5 +28438,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kino"
@@ -27826,10 +28445,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Knihovna"
@@ -27838,9 +28457,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -27848,10 +28467,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Divadlo"
@@ -27860,10 +28479,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -27873,5 +28492,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -27880,6 +28499,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Náboženství"
@@ -27888,66 +28507,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Vyznání"
@@ -27956,189 +28575,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnitské"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresy"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Upravit informace o adrese"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Číslo domu"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Jméno domu"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Ulice"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Jméno města"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Poštovní směrovací číslo"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Kód země"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Upravit interpolaci adres"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Schéma číslování"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "liché"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "sudé"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "abecední"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Inženýrské objekty"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Továrna"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Věž"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Typ věže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "telekomunikační"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "pozorovací"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Výška (metrů)"
@@ -28146,25 +28695,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Maják"
@@ -28172,10 +28721,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -28183,10 +28732,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -28195,41 +28744,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "teplo"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "ropa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "kanalizace"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Umístění"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "podvodní"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "nadzemní"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -28239,10 +28788,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Jeřáb"
@@ -28250,5 +28799,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
@@ -28256,10 +28805,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -28267,10 +28816,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -28278,23 +28827,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "vnitřní"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "venkovní"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -28304,35 +28853,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "sluneční"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -28341,10 +28890,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -28353,5 +28902,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -28359,10 +28908,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -28373,23 +28922,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "věž"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "stožár"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -28398,20 +28947,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Typ vedení"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28419,55 +28968,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Počet kabelů"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "jednoduchý"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "dvojitý"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "trojitý"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "čtveřitý"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Záchody"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -28476,5 +29025,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -28482,5 +29031,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mince"
@@ -28488,5 +29037,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Bankovky"
@@ -28494,5 +29043,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -28500,5 +29049,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -28506,15 +29055,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -28523,5 +29072,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -28529,35 +29078,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Plechovky"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Oblečení"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Odpadkový koš"
@@ -28565,5 +29109,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Upravit odpadkový koš"
@@ -28572,31 +29116,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Opěrka zad"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "kámen"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "černá"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "hnědá"
@@ -28675,5 +29219,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28683,31 +29227,31 @@
 msgstr "zeleň"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "bílá"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -28715,31 +29259,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontána"
@@ -28748,10 +29292,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -28760,10 +29304,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Požární hydrant"
@@ -28772,5 +29316,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Upravit požární hydrant"
@@ -28778,501 +29322,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Pěší"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Upravit supermarket"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Samoobsluha, smíšenka, večerka"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Upravit večerku"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosek"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Upravit kiosek"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Řeznictví"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Upravit řeznictví"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Pekařství"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Upravit pekařství"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Obchod se zdravou výživou"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Upravit obchod se zdravou výživou"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Upravit obchod s alkoholem"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Nápoje"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Upravit obchod s nápoji"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Obchody"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Drogerie"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Upravit drogerii"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Kadeřnictví"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Upravit Kadeřnictví"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Oční optik"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Upravit oční optiku"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Upravit obchod s počítači"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Obuv"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Upravit obchod s obuví"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Vybavení do přírody"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Obchod s vybavením do přírody"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Upravit obchod se sportovními pořebami"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Čistírna"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Upravit čistírnu"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Prádelna"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Upravit prádelnu"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Tamoil"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Upravit železnici"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Počítače"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Upravit obchod s počítači"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Upravit obchod s elektronikou"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Upravit obchod s hifi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Videopůjčovna/prodejna"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Upravit videopůjčovnu/prodejnu"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Květinářství"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Upravit květinářství"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Zahradnické centrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Upravit zahradnické centrum"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Železářství"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Upravit železářství"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Zboží pro kutily"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Upravit obchod se zbožím pro kutily"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Nábytek"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Upravit obchod s nábytkem"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Papírnictví"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Upravit papírnictví"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Knihkupectví"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Upravit knihkupectví"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Cestovní kancelář"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Upravit cestovní kancelář"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Hračky"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Upravit obchod s hračkami"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Prodejní automat"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Upravit prodejní automat"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Prodávané produkty"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "lístky na městskou hromadnou dopravu"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "plány městské hromadné dopravy"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "parkovací lístky"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "jídlo"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "pití"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "sladkosti"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigarety"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotografie"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "krmivo pro zvířata"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "noviny"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "hračky"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "známky"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-karty"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telefonní karty"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "poukazy"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "kondomy"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampóny"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "sáčky na výkaly"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+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:3045
+msgid "Cash"
+msgstr "Finance"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banka"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Upravit banku"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Bankomat"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Směnárna"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Upravit směnárnu"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Upravit bankomat"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Zdraví"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Zdavotní středisko, poliklinika"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Upravit zdravotní středisko, polikliniku"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Zubař"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Upravit zubařskou ordinaci"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Lékárna"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Upravit lékárnu"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Vydává léky na předpis"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Nemocnice"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Upravit nemocnici"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Babybox"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Obchody"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Prodejce automobilů"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Upravit obchod s auty"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Prodejce kol"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Upravit prodejnu kol"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Upravit supermarket"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Drogerie"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Upravit drogerii"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Samoobsluha, smíšenka, večerka"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Upravit večerku"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosek"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Upravit kiosek"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Knihkupectví"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Upravit knihkupectví"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Cestovní kancelář"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Upravit cestovní kancelář"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Řeznictví"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Upravit řeznictví"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Pekařství"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Upravit pekařství"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Květinářství"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Upravit květinářství"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Obchod se zdravou výživou"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Upravit obchod se zdravou výživou"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Upravit obchod s alkoholem"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Nápoje"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Upravit obchod s nápoji"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Počítače"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Upravit obchod s počítači"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Upravit obchod s elektronikou"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Upravit obchod s hifi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Nábytek"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Upravit obchod s nábytkem"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Zahradnické centrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Upravit zahradnické centrum"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Železářství"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Upravit železářství"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Zboží pro kutily"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Upravit obchod se zbožím pro kutily"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Papírnictví"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Upravit papírnictví"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Kadeřnictví"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Upravit Kadeřnictví"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Obuv"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Upravit obchod s obuví"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Hračky"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Upravit obchod s hračkami"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Videopůjčovna/prodejna"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Upravit videopůjčovnu/prodejnu"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Čistírna"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Upravit čistírnu"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Prádelna"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Upravit prádelnu"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Vybavení do přírody"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Obchod s vybavením do přírody"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Upravit obchod se sportovními pořebami"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Oční optik"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Upravit oční optiku"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Prodejní automat"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Upravit prodejní automat"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Prodávané produkty"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "lístky na městskou hromadnou dopravu"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "plány městské hromadné dopravy"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "parkovací lístky"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "jídlo"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "pití"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "sladkosti"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigarety"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotografie"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "krmivo pro zvířata"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "noviny"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "hračky"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "známky"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-karty"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telefonní karty"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "poukazy"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "kondomy"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampóny"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "sáčky na výkaly"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-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:2955
-msgid "Cash"
-msgstr "Finance"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banka"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Upravit banku"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Bankomat"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Směnárna"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Upravit směnárnu"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Upravit bankomat"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Zdraví"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Zdavotní středisko, poliklinika"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Upravit zdravotní středisko, polikliniku"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Zubař"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Upravit zubařskou ordinaci"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Lékárna"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Upravit lékárnu"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Vydává léky na předpis"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Nemocnice"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Upravit nemocnici"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -29281,5 +29827,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -29288,15 +29834,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -29304,5 +29850,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -29311,368 +29857,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Hranice"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Národní"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Upravit národní hranici"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrativní"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Upravit administrativní hranici"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Upravit civilní hranici"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Volební obvod"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Upravit volební obvod"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Národní park"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Upravit hranice národního parku"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Místa"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Stát"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Upravit stát"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Země"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Upravit zemi"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Kraj"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Okres"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Upravit okres"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Velkoměsto"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Město"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Upravit město"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Obec"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Upravit obci"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Samota"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Místní název"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Vrchol"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Upravit vrchol"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Ledovec"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Upravit ledovec"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Sopka"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Upravit sopku"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Vstup do jeskyně"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Upravit vstup do jeskyně"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Ostrov"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Ostrůvek"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Upravit ostrůvek"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "informace o přírodě"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Strom"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Upravit strom"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanické jméno"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Prales"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Editovat Prales"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "jehličnatý"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "listnatý"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "smíšený"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Les"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Upravit lesní plochu"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Přírodní rezervace"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Upravit přírodní rezervaci"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Vstup do jeskyně"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Upravit vstup do jeskyně"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Vrchol"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Upravit vrchol"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Ledovec"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Upravit ledovec"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Sopka"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Upravit sopku"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Hranice"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Národní"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Upravit národní hranici"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrativní"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Upravit administrativní hranici"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Upravit civilní hranici"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Volební obvod"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Upravit volební obvod"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Národní park"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Upravit hranice národního parku"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Suťoviště"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Upravit suťoviště"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Travnatá pahorkatina"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Upravit travnatou pahorkatinu"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Podrost"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Upravit podrost"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Vřesoviště"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Upravit vřesoviště"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Strom"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Upravit strom"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanické jméno"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Prales"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Editovat Prales"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "jehličnatý"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "listnatý"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "smíšený"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Les"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Upravit lesní plochu"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Přírodní rezervace"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Upravit přírodní rezervaci"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Suťoviště"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Upravit suťoviště"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Podrost"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Upravit podrost"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Travnatá pahorkatina"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Upravit travnatou pahorkatinu"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Vřesoviště"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Upravit vřesoviště"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Farma"
@@ -29681,45 +30233,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Louka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -29727,25 +30279,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -29753,10 +30305,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -29764,20 +30316,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -29785,5 +30337,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -29791,15 +30343,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -29807,9 +30359,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -29817,39 +30369,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Obchody"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -29857,15 +30409,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -29873,52 +30425,183 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Stanice"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresy"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Upravit informace o adrese"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Číslo domu"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Jméno domu"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Ulice"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Jméno města"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Poštovní směrovací číslo"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Kód země"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "V"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "J"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Upravit interpolaci adres"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Schéma číslování"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "liché"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "sudé"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "abecední"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Obsah"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Přidat informace autora"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Obrázek"
 
 #. item "Relations/Multipolygon"
@@ -29926,5 +30609,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -29936,5 +30619,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "vnější část"
@@ -29942,5 +30625,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -29948,5 +30631,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Hranice"
@@ -29957,5 +30640,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Upravit hranici"
@@ -29963,36 +30646,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Typ hranice"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administrativní"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "národní"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "civilní"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "politická"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Administrativní centrum"
@@ -30000,5 +30683,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -30007,5 +30690,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -30013,34 +30696,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -30049,15 +30732,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "na cestu"
@@ -30065,5 +30748,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Trasa"
@@ -30072,5 +30755,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -30078,132 +30761,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Typ trasy"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicykl"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "lyžařská"
@@ -30271,5 +30843,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30279,9 +30851,9 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "objízdná"
@@ -30295,10 +30867,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -30306,31 +30878,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -30339,30 +30911,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -34340,7 +34912,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34462,8 +35033,14 @@
 msgstr "Sicily - Itálie"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Zanechávat záložní soubory"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Vodní objekty"
 
 #~ msgid "Email"
@@ -34559,7 +35136,4 @@
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "V souboru \"{0}\" není časová značka EXIF"
-
-#~ msgid "Image"
-#~ msgstr "Obrázek"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 22859)
+++ applications/editors/josm/i18n/po/da.po	(revision 22863)
@@ -9,6 +9,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-13 23:31+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 01:29+0000\n"
 "Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -95,5 +95,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Advarsel"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -410,4 +410,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -425,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1048,5 +1049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1066,5 +1067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1461,13 +1462,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1476,5 +1477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1482,9 +1483,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1492,5 +1493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1524,8 +1525,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1534,9 +1535,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1552,6 +1553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1561,5 +1562,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1584,6 +1585,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Fejl"
@@ -1744,5 +1745,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Nej, afbryd"
@@ -2027,5 +2028,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2498,5 +2499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2540,9 +2541,9 @@
 "Vil du virkelig flytte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2551,9 +2552,9 @@
 "nærmeste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Slip museknappen for at stoppe rotationen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2836,5 +2837,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Søg"
@@ -3036,7 +3037,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3307,5 +3308,5 @@
 msgstr[1] "Flyt {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3463,31 +3464,31 @@
 msgstr "Automatisk tag-rettelse"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3506,15 +3507,15 @@
 msgstr "Ulovlig længdegradsværdi ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Advarsel: Kunne ikke gemme indstillinger i \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3525,5 +3526,5 @@
 "er ikke en mappe."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3534,5 +3535,5 @@
 "ikke en mappe.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3543,5 +3544,5 @@
 "manglende indstillingsmappe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3552,5 +3553,5 @@
 "indstillingsmappe: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3560,5 +3561,5 @@
 "indstillingsfil."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3569,5 +3570,5 @@
 "indstillingsfil."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3578,5 +3579,5 @@
 "indstillingsfil til standard: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3587,5 +3588,5 @@
 "<br> og opretter en ny standard-indstillingsfil.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3596,10 +3597,10 @@
 "indstillingsfil til standard: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Fejl: Uventet linje ''{0}'' i bogmærkefil ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3725,5 +3726,5 @@
 "allerede er inkluderet"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3800,9 +3801,9 @@
 "er {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3810,5 +3811,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4005,15 +4006,34 @@
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zone"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Nord"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "syd"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Hop dertil"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4037,9 +4057,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4082,5 +4102,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "jernbane"
@@ -4101,5 +4121,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4355,69 +4375,69 @@
 msgstr "Adgangskode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometrisk argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Download afgrænsningsfeltet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download stedet fra URL'en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Åbn en fil (enhver filtype der kan åbnes med Fil/Åbn)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Download afgrænsningsfeltet som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download stedet ved URL'en (med bredde=x&længde=y&zoom=z) som rå GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Vælg med den givne søgning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Start op i maksimeret tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Indstil sproget"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "options givet som Java systemegenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/STI/TIL/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Ændr folderen for alle bruger indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4431,9 +4451,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4441,57 +4461,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initialiserer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Opdaterer plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Installerer opdaterede plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Opretter hovedgrænseflade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Kreditkort"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4501,9 +4530,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4517,9 +4546,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4643,23 +4673,23 @@
 msgstr "Bruger:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "lag er ikke i listen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Lag \"{0}\" skal være i liste over lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4757,5 +4787,5 @@
 msgstr "Klik for at lukke dialogen og afbryde sletning af objekterne"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4763,17 +4793,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4783,25 +4813,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5227,4 +5257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5308,4 +5339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5322,4 +5354,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5393,5 +5426,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5403,10 +5436,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "intet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "alle"
@@ -5489,5 +5522,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5499,5 +5532,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5532,17 +5565,17 @@
 msgstr "Ikke afklaret endnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Indtast en rolle for alle relationsmedlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Tag modificerede relationer med "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5552,16 +5585,16 @@
 "tilføjet<br>alle ændrede relationer.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Nøgle:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Indtast en tag nøgle, f.eks. <strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
 #: ../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>Indtast en tag nøgle, f.eks. <strong><tt>fixme</tt></strong></html>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5569,5 +5602,5 @@
 msgstr "Værdi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5576,5 +5609,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5593,5 +5626,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5609,5 +5642,5 @@
 "relation: målpunktet vil erstatte det originale punkt i relationen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Anvend denne rolle for alle medlemmer"
@@ -5757,5 +5790,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5870,5 +5903,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5876,5 +5909,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5882,5 +5915,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5888,5 +5921,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5894,5 +5927,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5901,5 +5934,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5907,5 +5940,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5913,5 +5946,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5919,24 +5952,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objekter skjult"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5957,5 +5990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5980,37 +6013,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Indtast koordinater for det nye punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Brug decimalgrader"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative værdier angiver vestlig/sydlig halvkugle."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Indtast venligst en gyldig breddegrad i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Indtast venligst en breddegrad i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Indtast venligst en gyldig længdegrad i området -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Indtast venligst en længdegrad i området -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Luk dialogen og opret et nyt punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Luk dialogen uden at oprette et nyt punkt"
@@ -6066,9 +6099,9 @@
 msgstr "Information om lag"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relationer"
@@ -6117,10 +6150,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6140,37 +6173,37 @@
 msgstr "Åbn et vindue med en markeringsliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoom til markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zoom til markerede element(er)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Markér i relationsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Markér relation i relationsliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6179,32 +6212,32 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Markering: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Frigør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik for at minimere/maksimere panelet"
@@ -6492,13 +6525,13 @@
 msgstr "Intet at zoome ind på"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Indholdet af dette rettesæt er ikke downloadet endnu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Download nu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Download indholdet af rettesættet"
@@ -6610,4 +6643,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6626,6 +6663,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6643,8 +6678,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6655,4 +6697,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6667,33 +6715,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6717,12 +6754,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6794,10 +6841,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6827,8 +6878,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6891,6 +6938,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6943,4 +6988,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7005,32 +7062,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7039,6 +7104,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7047,24 +7114,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7079,82 +7136,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7235,155 +7292,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Navn"
@@ -7836,4 +7898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<forskellige>"
@@ -8366,17 +8429,17 @@
 "Advarsel: Ignorerer undtagelse fordi opgave er annulleret. Undtagelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "Inkluderer umiddelbare børn af forældrerelationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Hent forældrerelationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Henter forældrerelationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Rediger den nu markerede relation"
@@ -8663,4 +8726,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8668,15 +8732,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Type"
@@ -8695,16 +8759,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "ukendt"
@@ -9313,5 +9377,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Start en filvælger for at markere en fil"
@@ -9543,20 +9607,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Lag"
@@ -10036,5 +10100,63 @@
 msgstr[1] "{0} objekter at slette:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} spor"
+msgstr[1] "{0} spor"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Tidsrum"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Længde"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Længde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10042,62 +10164,17 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} spor"
 msgstr[1] "{0} spor"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Tidsrum"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Længde"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Længde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rute, "
-msgstr[1] "{0} ruter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10107,10 +10184,10 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10121,7 +10198,7 @@
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10129,10 +10206,10 @@
 msgstr "Download fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Download alt indenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10140,10 +10217,10 @@
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maksimum område per anmodning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10151,21 +10228,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10177,10 +10254,10 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10190,5 +10267,5 @@
 "blev udeladt eller flyttet til starten."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10198,30 +10275,30 @@
 "estimere deres tid blev udeladt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Brug globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter for dette lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkter for dette lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Vælg linjetegnings-indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10229,5 +10306,5 @@
 msgstr "Tilpas farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10236,5 +10313,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10243,18 +10320,18 @@
 msgstr "Vælg en farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Markører fra navngivne punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne punkter fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10267,23 +10344,23 @@
 "af hvordan de hænger sammen med lyddata.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import er ikke mulig"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importér billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10735,15 +10812,15 @@
 msgstr "Billedfilen kunne ikke slettes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Intet billede"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Henter {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11742,4 +11819,48 @@
 msgid "Voice recorder calibration"
 msgstr "Kalibrering af lydoptagelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Tid for indføring (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Standardværdien er \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Gem backup-filer med ~ i slutningen af filnavnet, når der gemmes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Backup af filer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Konfigurér om der skal oprettes backup-filer"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11823,5 +11944,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Bil"
@@ -11840,16 +11961,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Cykel"
@@ -11883,12 +12004,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Gående"
@@ -12144,18 +12265,18 @@
 msgstr "Standard (automatisk valgt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Slå indbyggede standarder til"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Slå standarder for indbyggede ikoner til"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Anvendt stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Korttegningsstile"
@@ -12472,17 +12593,13 @@
 msgstr "Projektionen {0} kunne ikke aktiveres. Bruger Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Proxy-indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Backup af filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
@@ -12490,11 +12607,7 @@
 "OSM-serveren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Konfigurér om der skal bruges en proxy-server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Konfigurér om der skal oprettes backup-filer"
 
 #. 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
@@ -12611,6 +12724,15 @@
 "<br><br>Detaljer (uoversat):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "skiftende"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12843,12 +12965,4 @@
 "autentikationsmetoden \"Basal autentikation\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Behold backup-filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Gem backup-filer med ~ i slutningen af filnavnet, når der gemmes"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13040,5 +13154,5 @@
 msgstr "Tilføj en ny tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13047,49 +13161,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mere information om denne feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Valgfri attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukendt type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13099,15 +13213,15 @@
 msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fejl ved fortolkning af {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13117,17 +13231,17 @@
 msgstr[1] "Ret {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Markering uegnet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Anvend fordefinition"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13756,5 +13870,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13865,5 +13979,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13872,5 +13986,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13939,5 +14053,5 @@
 msgstr "Fil ''{0}'' findes ikke."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13949,10 +14063,10 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13960,5 +14074,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13966,5 +14080,5 @@
 msgstr "Ulovlig værdi af attribut ''ref'' i element <nd>. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13972,10 +14086,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13983,5 +14097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13989,5 +14103,5 @@
 msgstr "Ulovlig værdi af attribut ''ref'' på medlem i relation {0}. Fik {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13995,5 +14109,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14003,10 +14117,10 @@
 "Ulovlig værdi af attribut ''type'' på medlem {0} i relation {1}. Fik {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufuldstændig <member>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14014,9 +14128,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14024,11 +14138,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Ugyldigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14041,8 +14155,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14058,5 +14172,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14064,5 +14178,5 @@
 msgstr "Ukendt eller ikke understøttet API version. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14071,6 +14185,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14084,6 +14198,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14092,5 +14206,5 @@
 msgstr "Ulovlig værdi af attribut ''rettesæt''. Fik {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14098,5 +14212,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14104,12 +14218,12 @@
 msgstr "Ulovlig long værdi af attribut ''{0}''. Fik ''{1}''."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14117,5 +14231,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14125,5 +14239,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14133,5 +14247,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14139,17 +14253,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Fortolker OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Forbereder data sæt..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14650,11 +14764,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14663,16 +14777,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14681,5 +14795,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14700,13 +14814,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Foretag intet"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Rapportér fejl"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14715,9 +14829,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Uventet handling"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14725,5 +14839,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14731,5 +14845,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14738,5 +14852,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14744,9 +14858,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(teksten er allerede kopieret til til din udklipsholder.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14968,5 +15082,5 @@
 "<br><br>Fejlmeddelelsen er: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15022,5 +15136,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15033,5 +15147,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15041,5 +15155,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15050,5 +15164,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Du kan rette genvejene i indstillingerne.)"
@@ -15155,5 +15269,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Synlighed"
@@ -15239,10 +15353,61 @@
 msgstr "Uploader GPX-spor til openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Åbningstider"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Ret egenskaber for op til {0} objekt"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Vælg"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Vej {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Værktøj: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "åben"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -15415,51 +15580,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Kan ikke tilføje et punkt uden for verdenen."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' må ikke være nul"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' må ikke være nul"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15558,16 +15725,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15581,5 +15740,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15692,5 +15851,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Bygninger"
@@ -15929,5 +16088,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16351,8 +16510,4 @@
 msgstr "Øst"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Nord"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16468,6 +16623,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Tomt lag"
@@ -17834,5 +17989,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Offentlig transport"
@@ -17876,48 +18031,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Vejpunkter"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "hent data fra API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "importerede data fra {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "Opret nye objekter"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "ændr markeringen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "skift synsfeltet"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "bekræft alle Fjernbetjenings-handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Fjernbetjening"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Indstillinger for Fjernbetjeningsudvidelsen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17929,34 +18089,34 @@
 "modulet."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Tilladte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Vil du tillade dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Bekræft Fjernbetjenings-handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Fjernstyring er blevet spurgt om at oprette et nyt punkt."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjernstyringen er blevet bedt om at importere data fra følgende URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjernstyringen er blevet bedt om at indlæse data fra API'et."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Anmod om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18179,58 +18339,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Glidende kort"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Hent tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Vis info om tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Hent alle tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Øg zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Reducér zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Ret ind til ternstørrelse"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Tøm tern-mellemlager"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "billede "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "auto-indlæs tern"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "Glidende mappe"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Indstillinger for SlippyMap-modulet"
@@ -18518,11 +18678,10 @@
 msgstr "Rækkehus"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Ret rørledning"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19608,5 +19767,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19731,59 +19890,59 @@
 msgstr "Overlappende veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20275,143 +20434,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "op"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Indtast venligst et heltal > 1"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Stente"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20431,7 +20587,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multi"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20536,12 +20691,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Vælg med den givne søgning"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Vejpunkter"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20558,9 +20711,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "En undtagelse opstod"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Ikke i mellemlager"
@@ -20619,21 +20772,21 @@
 msgstr "Juster det markerede WMS-lags position"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Markér venligst det WMS-lag, der skal justeres"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Markér WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Der er ikke noget WMS-lag at justere i øjeblikket"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20644,5 +20797,5 @@
 msgstr "Download WMS-tern fra {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20653,5 +20806,5 @@
 "eller en '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20661,10 +20814,10 @@
 "indstillinger."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20676,24 +20829,24 @@
 "Dette kan føre til forkerte koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Advarsel: WMS-lag deaktiveret på grund af misformet basal URL \"{0}\""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(deaktiveret)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lag ({0}) downloader automatisk i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lag ({0}) downloader i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20708,17 +20861,17 @@
 "hente WMS-tern alligevel?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Ja hent billeder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Ugyldig URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Download synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20727,58 +20880,82 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Indlæs WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Indlæs WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Sæt WMS-bogmærke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatisk download"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åbn et tomt WMS-lag at indlæse data til fra en fil"
@@ -20847,8 +21024,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Fjernstyringen er blevet bedt om at importere data fra følgende URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21363,16 +21539,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Viser et OpenLayers baggrundsbillede"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer sager fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21381,5 +21562,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21388,5 +21569,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21395,5 +21576,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21404,10 +21585,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21415,15 +21596,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21433,5 +21614,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21442,10 +21623,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Tilføjer ruteplan-egenskaber"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21454,5 +21635,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21463,15 +21644,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21484,15 +21665,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21501,5 +21682,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21508,5 +21689,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21515,10 +21696,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21529,5 +21710,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21537,5 +21718,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21546,20 +21727,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21568,5 +21749,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21608,4 +21789,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21638,10 +21820,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Veje"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Veje"
@@ -21652,5 +21834,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorvej"
@@ -21659,5 +21841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Ret motorvej"
@@ -21694,10 +21876,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Reference"
@@ -21711,8 +21893,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Baner"
@@ -21731,13 +21913,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Maks. hastighed (km/t)"
@@ -21771,17 +21953,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Ensrettet"
@@ -21818,17 +22000,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21862,17 +22044,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -21903,17 +22085,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Indhak"
@@ -21944,17 +22126,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Vold"
@@ -21962,5 +22144,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Motorvejsforbindelse"
@@ -21969,5 +22151,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Ret motorvejsforbindelse"
@@ -21975,5 +22157,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Motortrafikvej"
@@ -21982,5 +22164,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Ret motortrafikvej"
@@ -21990,6 +22172,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Hovedvej"
@@ -21997,5 +22179,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Motortrafikvejsforbindelse"
@@ -22004,5 +22186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Ret motortrafikvejsforbindelse"
@@ -22015,5 +22197,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primær"
@@ -22022,5 +22204,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Ret en hovedvej"
@@ -22028,10 +22210,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Primærforbindelse"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Ret primærforbindelse"
@@ -22043,5 +22225,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Sekundær"
@@ -22051,5 +22233,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Ret en bivej"
@@ -22057,5 +22239,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Tertiær"
@@ -22065,5 +22247,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Ret en tertiær vej"
@@ -22075,5 +22257,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Uklassificeret"
@@ -22083,5 +22265,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Ret uklassificeret vej"
@@ -22091,6 +22273,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -22113,15 +22295,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Bredde (meter)"
@@ -22133,5 +22315,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Beboelse"
@@ -22140,5 +22322,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Ret en beboelsesgade"
@@ -22158,12 +22340,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Overflade"
@@ -22185,166 +22367,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "brolagt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "ikke brolagt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "træ"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "fliser"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "brosten"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "småsten"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "kompakteret"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "Græs_belægning"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "græs"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "jord"
@@ -22352,5 +22534,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Legegade"
@@ -22359,5 +22541,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Ret legegade"
@@ -22365,5 +22547,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Gågade"
@@ -22372,5 +22554,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Ret gågade"
@@ -22378,5 +22560,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Service"
@@ -22385,5 +22567,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Ret servicevej"
@@ -22393,18 +22575,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "gyde"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "Vej mellem parkeringsbåse"
@@ -22412,5 +22594,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Vej mellem parkeringsbåse"
@@ -22420,10 +22602,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Ret vej mellem parkeringsbåse"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Vej (ukendt type)"
@@ -22432,5 +22614,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Ret vej af ukendt type"
@@ -22438,14 +22620,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Under udførelse"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Ret vej under udførelse"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Kryds"
@@ -22461,5 +22643,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -22468,5 +22650,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Adgangsbegrænsninger"
@@ -22475,15 +22657,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Ret adgangsbegrænsninger"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Betalingsanlæg"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Blind vej"
@@ -22491,5 +22673,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Adgang"
@@ -22515,4 +22697,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22520,4 +22703,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22593,236 +22782,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privat"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "tilladt"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "landbrug"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nej"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "designeret"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privat"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "tilladt"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "landbrug"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nej"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "designeret"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Lastbil"
@@ -22837,10 +23033,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Hest"
@@ -22856,10 +23052,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -22874,19 +23071,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Motorkøretøj"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighed (km/t)"
@@ -22894,20 +23091,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Maks. vægt (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Maks. højde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Maks. bredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Maks. længde (meter)"
@@ -22915,5 +23112,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -22924,5 +23121,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Ret trafikknudepunkt"
@@ -22942,10 +23139,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorvej"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "motorvejsforbindelse"
@@ -22967,10 +23164,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "motortrafikvej"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "motortrafikvejsforbindelse"
@@ -22992,10 +23189,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primær"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "primær-(til/fra)-kørsel"
@@ -23017,5 +23214,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23030,9 +23227,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiær"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "uklassificeret"
@@ -23046,9 +23243,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "beboelse"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "legegade"
@@ -23092,10 +23289,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "bus-ledevej"
@@ -23125,5 +23322,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23135,10 +23332,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Ret bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Ret en tunnel"
@@ -23146,10 +23343,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Stier"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Spor"
@@ -23158,35 +23355,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Ret spor"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -23194,5 +23391,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Sti"
@@ -23201,76 +23398,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Ret sti"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "vandring"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Motorslæde"
@@ -23279,5 +23476,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -23285,5 +23482,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Ret ridesti"
@@ -23291,5 +23488,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -23307,11 +23504,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Ret cykelsti"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Fodgængere"
@@ -23319,5 +23516,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -23325,5 +23522,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -23331,5 +23528,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -23338,5 +23535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Ret gangsti"
@@ -23344,5 +23541,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Trin"
@@ -23352,10 +23549,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Ret trappetrin"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Antal sæder"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Motorvejskryds"
@@ -23363,15 +23566,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Ret motorvejskryds"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Motorvejsrasteplads"
@@ -23379,5 +23582,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Ret tankstation"
@@ -23385,10 +23588,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23417,36 +23621,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Selskab"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "bæk"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Ret restaurant"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Nødtelefon"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Færdselssignal"
@@ -23456,5 +23681,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Type af fodgængerfelt"
@@ -23463,27 +23688,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "ukontrolleret"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "trafik_lys"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "helleanlæg"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "uden markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Overgangssted for ridende"
@@ -23491,6 +23716,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Overkørsel for cykler"
@@ -23499,11 +23724,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -23511,30 +23736,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "fodgængerfelt"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "fodgængerfelt med trafikstyring"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -23542,67 +23767,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Fodgængerfelt"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Ret overkørsel"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rundkørsel"
@@ -23613,14 +23776,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "med uret"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Fodgængerfelt"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Ret overkørsel"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Vendeplads"
@@ -23630,5 +23855,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Bygrænse"
@@ -23636,15 +23861,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Ret et bygrænse-skilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Andet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Fartkamera"
@@ -23653,11 +23878,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Nødtelefon"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Stigning"
@@ -23665,5 +23885,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Stejl stigning"
@@ -23671,5 +23891,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23679,10 +23899,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Ret vadested"
@@ -23690,5 +23910,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Bjergpas"
@@ -23696,5 +23916,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Ret bjergpas"
@@ -23703,10 +23923,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Højde"
@@ -23714,5 +23934,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barrierer"
@@ -23720,5 +23940,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Pæl"
@@ -23726,5 +23946,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Ret en pæl"
@@ -23769,16 +23989,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Cykelhindring"
@@ -23787,5 +24007,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23793,5 +24013,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Kreaturrist"
@@ -23799,10 +24019,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Ret en kreaturrist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -23810,15 +24030,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Pigge"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Betalingsanlæg"
@@ -23826,5 +24046,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Ret betalingsanlæg"
@@ -23832,10 +24052,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Grænsekontrol"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Ret grænsekontrol"
@@ -23844,5 +24064,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Hæk"
@@ -23853,22 +24073,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Hegn"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Mur"
@@ -23876,5 +24096,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Bymur"
@@ -23883,5 +24103,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -23892,10 +24112,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Indgang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Ret indgang"
@@ -23903,5 +24123,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Port"
@@ -23909,50 +24129,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Ret port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Ret bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Trådled"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Ret trådled"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Skubbeport"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Ret skubbeport"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Stente"
@@ -23960,25 +24180,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Ret en stente"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Udfaldsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Ret en udfaldsport"
@@ -23986,25 +24206,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Vand"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Udspring"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Ret udspring"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Dræn"
@@ -24012,10 +24221,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Ret dræn"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -24023,10 +24232,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Bæk"
@@ -24034,10 +24243,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Ret bæk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanal"
@@ -24045,10 +24254,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Ret kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Flod"
@@ -24058,59 +24267,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Ret flod"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Udspring"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Ret udspring"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Vandfald"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Ret vandfald"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Damlukke"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Ret stemmeværk"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Dæmning"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Ret dæmning"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Bassin"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Vandreservoir"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Ret område for vandreservoir"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Overdækket reservoir"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Ret overdækket reservoir"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Ret vand"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Ret land"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Bassin"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Vandreservoir"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Ret område for vandreservoir"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Overdækket reservoir"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Ret overdækket reservoir"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Kystlinje"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Ret kystlinje"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Flodbred"
@@ -24119,10 +24382,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Ret flodbred"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Vådområde"
@@ -24133,14 +24397,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Ret vådområde"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Sump"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "mose"
@@ -24154,35 +24418,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsk"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "marskland"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "saltmarsk"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "vadehavsområde"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Mudder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Ret mudder"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Strand"
@@ -24190,20 +24454,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Ret strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Bugt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Ret bugt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Klippe"
@@ -24211,145 +24475,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Ret klippe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Kystlinje"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Ret kystlinje"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Forretninger"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Færgehavn"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Ret færgehavn"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Bil"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "nybegynder"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "cykel"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Færgerute"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Ret færge"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Værft"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Ret værft"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dok"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Ret dok"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Dæmning"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Ret dæmning"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Vandvejs-punkt"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Lystbådehavn"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Ret lystbådehavn"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Mole"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Ret mole"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Sluseport"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Damlukke"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Ret stemmeværk"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Vandfald"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Ret vandfald"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Lystbådehavn"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Ret lystbådehavn"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Mole"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Ret mole"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Færgehavn"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Ret færgehavn"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Slæbested"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24359,16 +24694,38 @@
 msgstr "Ret slæbested"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Værft"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Ret værft"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dok"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Ret dok"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Spor"
@@ -24376,5 +24733,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Ret spor"
@@ -24404,7 +24761,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24420,8 +24777,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24435,29 +24792,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "Banegård"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24470,8 +24827,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24542,8 +24899,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24555,8 +24912,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Spænding"
@@ -24569,8 +24926,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -24583,23 +24940,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Smalsporet bane"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Ret smalsporet jernbane"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24607,50 +24964,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Ret monorail"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Bevaret"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Ret bevaret jernbane"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Letbane"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Ret letbane"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Ret metro"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Sporvogn"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Ret sporvogn"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Styreskinne til bus"
@@ -24658,5 +25015,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Ret styreskinne til bus"
@@ -24665,10 +25022,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Ubrugt jernbanespor"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Ret ubrugt jernbanespor"
@@ -24677,9 +25034,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Valgfri typer"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Fjernet jernbane"
@@ -24688,5 +25045,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Jernbaneoverskæring"
@@ -24695,5 +25052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Fodgængerovergang (over jernbane)"
@@ -24703,5 +25060,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Overgangstype"
@@ -24709,5 +25066,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Drejeskive"
@@ -24716,5 +25073,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24723,10 +25080,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Luftvej"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Skilift"
@@ -24734,10 +25091,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Ret skilift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Træklift"
@@ -24745,10 +25102,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Ret træklift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Tovbane"
@@ -24756,10 +25113,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Ret tovbane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondol"
@@ -24767,10 +25124,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Ret Gondol"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24779,5 +25137,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24785,5 +25143,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24792,5 +25150,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24798,5 +25156,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Brændstof"
@@ -24806,69 +25164,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Ret brændstof"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24885,34 +25265,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24920,37 +25301,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Åbningstider"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24971,33 +25363,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25006,170 +25400,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mandag-Fredag 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "butik"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Købmand"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -25177,4 +25593,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25186,6 +25603,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkering"
@@ -25194,5 +25611,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Ret parkering"
@@ -25203,25 +25620,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referensenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "fleretages"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "overflade"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Parkér og kør"
@@ -25230,54 +25649,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Handicapplads"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Område for kvinder"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Område for forældre"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Vask"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Ret bilvask"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Bilforhandler"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Ret bilforhandler"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Bilmekaniker"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Ret bilmekaniker"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "ja"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Ret et træ"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Indhold"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Udlejning"
@@ -25286,10 +25849,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Ret biludlejning"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Deling"
@@ -25297,28 +25859,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Ret bildeling"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Ret cykelparkering"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Kapacitet"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorcykel"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Ret motorvej"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Motorvejsrasteplads"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Gem"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "land"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Fordefinerede"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Tøj"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Ret cykelparkering"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Kapacitet"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Cykelhandler"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Ret cykelhandler"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Ret cykeludlejning"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25328,5 +25949,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25334,5 +25955,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-reference"
@@ -25340,5 +25961,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Jernbane-stop"
@@ -25346,5 +25967,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Ret stop"
@@ -25352,5 +25973,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Sporvogns-stop"
@@ -25359,5 +25980,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Ret sporvogns-stop"
@@ -25365,5 +25986,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Jernbaneplatform"
@@ -25372,5 +25993,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Ret jernbaneplatform"
@@ -25382,5 +26003,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -25388,10 +26009,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Indgang til undergrundsbane"
@@ -25400,10 +26021,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Ret indgang til undergrundsbane"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -25412,5 +26033,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Rutebilstation"
@@ -25419,5 +26040,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Ret rutebilstation"
@@ -25425,5 +26046,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Busstop"
@@ -25433,13 +26054,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Ret busstop"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Læskur"
@@ -25447,19 +26067,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Bænk"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Rutebil-platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Ret rutebil-platform"
@@ -25467,5 +26087,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -25473,5 +26093,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Ret taxiholdeplads"
@@ -25479,10 +26099,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Lufthavn"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25490,5 +26110,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25496,10 +26116,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25508,5 +26128,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -25514,5 +26134,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -25520,5 +26140,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -25526,5 +26146,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -25532,5 +26152,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25538,5 +26158,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25546,5 +26166,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25554,5 +26174,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -25563,6 +26183,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -25572,5 +26192,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25579,5 +26199,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -25585,5 +26205,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -25591,15 +26211,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Rejse"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -25611,5 +26231,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25618,5 +26238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Ret hotel"
@@ -25629,8 +26249,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stjerner"
@@ -25654,34 +26274,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25695,168 +26315,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -25864,20 +26389,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Ret motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -25885,10 +26410,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Ret feriehytte"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -25896,30 +26421,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Ret alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Campingplads"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Ret campingplads"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Camping plads"
@@ -25927,10 +26453,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Ret campingplads"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -25941,5 +26467,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25947,5 +26473,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
@@ -25953,5 +26479,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Køkken"
@@ -25959,79 +26487,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -26039,18 +26567,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26058,10 +26586,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Café"
@@ -26069,10 +26597,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Ret café"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -26080,20 +26613,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Ret pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Ret biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -26101,10 +26634,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Ret bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Natklub"
@@ -26112,25 +26645,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -26138,9 +26671,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Ret museum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -26149,9 +26682,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Forlystelsespark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Ret forlystelsespark"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Kunstværk"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Ret kunstværk"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -26159,50 +26713,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Ret udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Forlystelsespark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Ret forlystelsespark"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Kunstværk"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Ret kunstværk"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Ret shelter"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Bålplads"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Picnic sted"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Ret picnic sted"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Informationskontor"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -26240,5 +26795,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26246,28 +26801,28 @@
 msgstr "gade"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Vist område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "sted"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "by"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
@@ -26277,5 +26832,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Ruter vist for:"
@@ -26283,5 +26838,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Vandring"
@@ -26289,6 +26844,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cykling"
@@ -26296,5 +26851,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -26302,6 +26857,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skisport"
@@ -26309,5 +26864,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Ridning"
@@ -26315,46 +26870,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Guide post"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26363,5 +26918,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informations terminal"
@@ -26369,55 +26924,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audio guide"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audio guide via mobiletelefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Andre informations punkter"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Ret shelter"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Bålplads"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Picnic sted"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Ret picnic sted"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Borg"
@@ -26426,19 +26960,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -26447,9 +26981,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -26457,10 +26991,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Palæontologisk sted"
@@ -26468,5 +27002,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Ret palæontologisk sted"
@@ -26474,15 +27008,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -26490,55 +27024,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Ret vejkantskors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Grænsesten"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Ret grænsesten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Legeplads"
@@ -26546,35 +27080,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -26588,6 +27122,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -27003,6 +27537,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27037,240 +27571,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Væddeløbsbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Ret væddeløbsbane"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -27287,5 +27821,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27312,23 +27845,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "type"
@@ -27345,5 +27886,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27370,211 +27910,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "sportshal"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "spor"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Ret kanosport"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Ret cykling"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motorsport"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Ret motorsport"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -27582,52 +28125,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "styrtløb"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "skiløb"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Skydning"
@@ -27635,204 +28178,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Petanque"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motorsport"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Ret motorsport"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Advarsel"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Ret parkering"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Motorkøretøj"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Ret motorsport"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Ret skating"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Ret grænsekontrol"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Bil"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Ret tovbane"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Menneskeskabt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Bygning"
@@ -27840,5 +28449,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -27846,10 +28455,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Rådhus"
@@ -27857,10 +28466,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27868,10 +28477,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Domhus"
@@ -27880,10 +28489,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Fængsel"
@@ -27892,10 +28501,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Politi"
@@ -27905,10 +28514,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -27917,10 +28526,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Posthus"
@@ -27928,5 +28537,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -27934,15 +28543,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Skole"
@@ -27950,10 +28559,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universitet"
@@ -27961,10 +28570,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Videregående udd."
@@ -27972,5 +28581,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Ret videregående udd."
@@ -27978,5 +28587,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Biograf"
@@ -27985,10 +28594,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bibliotek"
@@ -27997,9 +28606,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -28007,10 +28616,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Ret kunstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teater"
@@ -28019,10 +28628,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -28032,5 +28641,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -28039,6 +28648,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -28047,66 +28656,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Trosretning"
@@ -28115,189 +28724,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnitisk"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresser"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Ret adresseinformation"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Husnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Husnavn"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Vejnavn"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Bynavn"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Postnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Landekode"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Ret adresse-interpolering"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Nummereringssystem"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "ulige"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "lige"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabetisk"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Type af tårn"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "kommunikation"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Højde (meter)"
@@ -28305,25 +28844,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -28331,10 +28870,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -28342,10 +28881,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -28354,41 +28893,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "varme"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "olie"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "Spildevand"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Sted"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "undervands"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "på land"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -28398,10 +28937,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Kran"
@@ -28409,5 +28948,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Ret kran"
@@ -28415,10 +28954,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Målepunkt"
@@ -28426,10 +28965,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Ret målepunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -28437,23 +28976,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Generator"
@@ -28463,35 +29002,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "sol"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -28500,10 +29039,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -28512,5 +29051,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -28518,10 +29057,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Linie reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Elmast"
@@ -28532,23 +29071,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "tårn"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "stang"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Tårn reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -28557,20 +29096,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Linie type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28578,55 +29117,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "enkelt"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "dobbelt"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "tredobbelt"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "firdobbelt"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toiletter"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -28635,5 +29174,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -28641,5 +29180,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mønter"
@@ -28647,5 +29186,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Sedler"
@@ -28653,5 +29192,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroniske punge og betalingskort"
@@ -28659,5 +29198,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Kreditkort"
@@ -28665,15 +29204,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Genbrug"
@@ -28682,5 +29221,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -28688,35 +29227,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Dåser"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Tøj"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28724,5 +29258,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28731,31 +29265,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "sten"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Farve"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "sort"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "brun"
@@ -28834,5 +29368,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28842,31 +29376,31 @@
 msgstr "grøn"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "hvid"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Antal sæder"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -28874,31 +29408,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Springvand"
@@ -28907,10 +29441,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -28919,10 +29453,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28931,5 +29465,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28937,501 +29471,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Gående"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarked"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Ret supermarked"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Købmand"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Ret købmand"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Ret kiosk"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Slagter"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Ret slagter"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Bager"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Ret bager"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Økologisk"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Ret økologisk forretning"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Sprit"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Ret spritbutik"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Drikkevarer"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Ret drikkevarebutik"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Butikker"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Frisør"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Ret frisør"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Ret optiker"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Ret computerforretning"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Sko"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Ret skobutik"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Ret sportsbutik"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Kemisk renseri"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Ret kemisk renseri"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Vaskeri"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Ret vaskeri"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Spor"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Ret spor"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Ret computerforretning"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronik"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Ret elektronikforretning"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hi-fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Ret hi-fi-forhandler"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Ret videobutik"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Blomsterhandler"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Ret blomsterhandler"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Havecenter"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Ret havecenter"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Isenkræmmer"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Ret isenkræmmer"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Gør-det-selv-butik"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Ret gør-det-selv-butik"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Møbelforretning"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Ret møbelforretning"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Boghandler"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Ret boghandler"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Rejsebureau"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Ret rejsebureau"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Legetøjsbutik"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Ret legetøjsbutik"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Automat"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Ret automat"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Varer i automat"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "P-automat"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "mad"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "drikke"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "slik"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigaretter"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "billeder"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "dyremad"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "aviser"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "legetøj"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "frimærker"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-kort"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telefonkort"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "kondomer"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tamponer"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "høm-høm-pose"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Penge"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Bank"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Ret bank"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Pengeautomat"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Vekselkontor"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Ret vekselkontor"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Ret pengeautomat"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Sundhed"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Lægehus"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Ret lægehus"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Tandlæge"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Ret tandlæge"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Apotek"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Ret apotek"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Håndkøb"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hospital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Ret Hospital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Babyluge"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Butikker"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Bilforhandler"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Ret bilforhandler"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Cykelhandler"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Ret cykelhandler"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarked"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Ret supermarked"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Købmand"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Ret købmand"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Ret kiosk"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Boghandler"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Ret boghandler"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Rejsebureau"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Ret rejsebureau"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Slagter"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Ret slagter"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Bager"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Ret bager"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Blomsterhandler"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Ret blomsterhandler"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Økologisk"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Ret økologisk forretning"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Sprit"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Ret spritbutik"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Drikkevarer"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Ret drikkevarebutik"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Ret computerforretning"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronik"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Ret elektronikforretning"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hi-fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Ret hi-fi-forhandler"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Møbelforretning"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Ret møbelforretning"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Havecenter"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Ret havecenter"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Isenkræmmer"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Ret isenkræmmer"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Gør-det-selv-butik"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Ret gør-det-selv-butik"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Frisør"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Ret frisør"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Sko"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Ret skobutik"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Legetøjsbutik"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Ret legetøjsbutik"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Ret videobutik"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Kemisk renseri"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Ret kemisk renseri"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Vaskeri"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Ret vaskeri"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Ret sportsbutik"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Ret optiker"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Automat"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Ret automat"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Varer i automat"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "P-automat"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "mad"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "drikke"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "slik"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigaretter"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "billeder"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "dyremad"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "aviser"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "legetøj"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "frimærker"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-kort"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telefonkort"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "kondomer"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tamponer"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "høm-høm-pose"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Penge"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Bank"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Ret bank"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Pengeautomat"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Vekselkontor"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Ret vekselkontor"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Ret pengeautomat"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Sundhed"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Lægehus"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Ret lægehus"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Tandlæge"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Ret tandlæge"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Apotek"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Ret apotek"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Håndkøb"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hospital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Ret Hospital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -29440,5 +29976,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -29447,15 +29983,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -29463,5 +29999,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -29470,368 +30006,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Grænser"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "National"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Ret landegrænser"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrativt"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Ret administrativ grænse"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Ret civil-grænse"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politisk"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Ret politisk grænse"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Nationalpark"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Ret grænser for nationalpark"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Steder"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Land"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Ret land"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Stat"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Ret stat"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Ret region"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Amt"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Ret amt"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Storby"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Ret storby"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "By"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Ret By"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Forstad"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Mindre by"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Ret mindre by"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Landsby"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Egn"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Tinde"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Ret tinde"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Gletsjer"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Ret gletsjer"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulkan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Ret vulkan"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Huleindgang"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Ret huleindgang"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Ø"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Ret ø"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natur"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Træ"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Ret et træ"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanisk navn"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Naturskov"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Ret naturskov"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "Nåleskov"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "Løvskov"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "blandet"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Skov"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Ret skovområde"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Naturreservat"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Ret naturreservat"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Huleindgang"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Ret huleindgang"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Tinde"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Ret tinde"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Gletsjer"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Ret gletsjer"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulkan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Ret vulkan"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Grænser"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "National"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Ret landegrænser"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrativt"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Ret administrativ grænse"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Ret civil-grænse"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politisk"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Ret politisk grænse"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Nationalpark"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Ret grænser for nationalpark"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Ur"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Ret ur"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Fjeldområde"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Ret fjeldområde"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Krat"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Ret krat"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Hede"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Ret hede"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Træ"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Ret et træ"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanisk navn"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Naturskov"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Ret naturskov"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "Nåleskov"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "Løvskov"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "blandet"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Skov"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Ret skovområde"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Naturreservat"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Ret naturreservat"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Ur"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Ret ur"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Krat"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Ret krat"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Fjeldområde"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Ret fjeldområde"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Hede"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Ret hede"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -29840,45 +30382,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Jordbrugsland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Ret landbrugsland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -29886,25 +30428,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Have"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Græs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29912,10 +30454,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29923,20 +30465,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -29944,5 +30486,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -29950,15 +30492,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Gravplads"
@@ -29966,9 +30508,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Ret gravplads"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -29976,39 +30518,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industri"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -30016,15 +30558,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militært område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -30032,52 +30574,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Losseplads"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Ret losseplads"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Station"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresser"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Ret adresseinformation"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Husnummer"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Husnavn"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Vejnavn"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Bynavn"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Postnummer"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Landekode"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "Ø"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Ret adresse-interpolering"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Nummereringssystem"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "ulige"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "lige"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabetisk"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Indhold"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Angiv forfatter"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Billede"
 
 #. item "Relations/Multipolygon"
@@ -30085,5 +30760,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -30095,5 +30770,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "ydre segment"
@@ -30101,5 +30776,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "indre segment"
@@ -30107,5 +30782,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -30116,5 +30791,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -30122,36 +30797,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -30159,5 +30834,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -30166,5 +30841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -30172,34 +30847,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "ingen_venstre_sving"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "ingen_højre_sving"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "ingen_lige_ud"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "ingen_u_vendinger"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "kun_højre_sving"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "kun_venstre_sving"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "kun_lige_ud"
@@ -30208,15 +30883,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "fra vej"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "til vej"
@@ -30224,5 +30899,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Rute"
@@ -30231,5 +30906,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -30237,132 +30912,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Rutetype"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "cykel"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -30430,5 +30994,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30438,9 +31002,9 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "sporvogn"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "omvej"
@@ -30454,10 +31018,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -30465,31 +31029,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "skiftende"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -30498,30 +31062,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34499,7 +35063,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34621,8 +35184,14 @@
 msgstr "Sicilen - Italien"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Behold backup-filer"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Vandvejs-punkt"
 
 #~ msgid "Move"
@@ -34755,7 +35324,4 @@
 #~ msgid "Read GPX..."
 #~ msgstr "Indlæs GPX..."
-
-#~ msgid "Image"
-#~ msgstr "Billede"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 22859)
+++ applications/editors/josm/i18n/po/de.po	(revision 22863)
@@ -8,7 +8,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-20 19:10+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-29 11:48+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@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-08-20 19:12+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Warnung"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java-OpenStreetMap-Editor"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -412,4 +412,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -427,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1053,5 +1054,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1060,5 +1061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1071,5 +1072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1474,13 +1475,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "Bereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr "Löschen bestätigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1492,5 +1493,5 @@
 "Server gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1500,9 +1501,9 @@
 "bereinigt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Zur Auswahl hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1512,5 +1513,5 @@
 "verworfen werden sollen. </html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Leere Rückgängig/Wiederholen-Puffer"
@@ -1544,8 +1545,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1554,9 +1555,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1572,6 +1573,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1581,5 +1582,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1604,6 +1605,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Fehler"
@@ -1765,5 +1766,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Nein, abbrechen"
@@ -2058,5 +2059,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2549,5 +2550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2591,9 +2592,9 @@
 "Wollen Sie sie wirklich verschieben?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2602,9 +2603,9 @@
 "Knoten vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2895,5 +2896,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Suche"
@@ -3104,7 +3105,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3349,4 +3350,6 @@
 "because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
+"Sie wollen unvollständige Objekte löschen.<br>Dies verursacht Probleme, da "
+"Sie die realen Objekte nicht sehen können.<b>Wollen Sie wirklich löschen?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3377,5 +3380,5 @@
 msgstr[1] "{0} Knoten bewegen"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3533,6 +3536,6 @@
 msgstr "Automatische Merkmalskorrektur"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
@@ -3541,5 +3544,5 @@
 "wurden deaktiviert."
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
@@ -3548,5 +3551,5 @@
 "verwendet."
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
@@ -3555,15 +3558,15 @@
 "deaktiviert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "Fehler bei Löschung der alten Backup-Datei {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "Fehler bei der Erstellung des entfernten Layers: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3583,15 +3586,15 @@
 msgstr "Ungültiger Längenwert ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Achtung: Fehler beim Speichern der Voreinstellungen in \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ungültige Einstellungen in den Zeilen {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3602,5 +3605,5 @@
 "Verzeichnis \"{0}\" kein Verzeichnis ist."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3611,5 +3614,5 @@
 "\"{0}\" kein Verzeichnis ist.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3620,5 +3623,5 @@
 "nicht erstellt werden konnte."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3629,5 +3632,5 @@
 "Einstellungsverzeichnis konnte nicht erstellt werden: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3637,5 +3640,5 @@
 "Standardeinstellungen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3646,5 +3649,5 @@
 "Standardeinstellungen ersetzt."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3655,5 +3658,5 @@
 "konnte nicht auf Standardwerte zurückgesetzt werden: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3665,5 +3668,5 @@
 "Standardwerten erzeugt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3674,10 +3677,10 @@
 "konnte nicht auf Standardwerte zurückgesetzt werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3809,5 +3812,5 @@
 "enthalten ist"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3895,9 +3898,9 @@
 "Änderungssatz-Nummer ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3905,5 +3908,5 @@
 msgstr "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4103,15 +4106,34 @@
 msgstr "PUWG-2000-Zone {0} (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swissgrid (Schweiz)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zone"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Nord"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Süd"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Dorthin springen"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4135,9 +4157,9 @@
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM-Frankreich (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "Geodätisches System UTM"
@@ -4182,5 +4204,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "Eisenbahn"
@@ -4201,5 +4223,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4458,70 +4480,70 @@
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Eine Datei öffnen (jeder Dateityp, welcher von Datei/Öffnen unterstützt wird)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "GPS-Daten am Ort der URL (mit lat=x&lon=y&zoom=z) herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Sprache einstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4535,9 +4557,9 @@
 "festgelegt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4547,60 +4569,70 @@
 "Reihenfolge verarbeitet."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Stellen Sie sicher, dass sie Daten laden, falls Sie --selection verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initialisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Plugins aktualisieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Aktualisierte Plugins installieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Nicht gespeicherte osm-Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Wiederherstellen"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-"JOSM hat {0} ungespeicherte osm-Datenlayer gefunden. Es scheint als ist JOSM "
-"zuletzt abgestürzt. Wollen sie die Daten wiederherstellen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Konto- oder EC-Karten"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+"JOSM hat {0} ungespeicherte OSM-Datenebenen gefunden. Anscheinend ist JOSM "
+"abgestürzt. Sollen die Daten wiederhergestellt werden?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4613,9 +4645,9 @@
 "Kompatible) Version des JOSM nutzen.</li></ul>Weitere Informationen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "JOSM Verlassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Fortfahren, trotzdem versuchen"
@@ -4629,9 +4661,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4755,23 +4788,23 @@
 msgstr "Nutzer:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Metrisch"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Britisches System"
@@ -4873,5 +4906,5 @@
 "Klicken, um das Fenster zu schließen und das Löschen der Objekte abzubrechen"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4881,17 +4914,17 @@
 "einer festen Zoomstufe.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Zoomstufe:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "von Kachel"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "bis Kachel"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4905,25 +4938,25 @@
 "ebenfalls gültig.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Kacheladresse:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Kacheladresse anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Bitte geben Sie eine Kacheladresse ein"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Der aktuelle Wert ist keine gültige Kacheladresse"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Bitte geben Sie einen Kachelindex ein"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5348,4 +5381,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5430,4 +5464,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5444,4 +5479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5515,5 +5551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5525,10 +5561,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "Kein"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "alle"
@@ -5611,5 +5647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5621,5 +5657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5654,17 +5690,17 @@
 msgstr "Noch ohne Lösung"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Eingeben einer Rolle für alle Relationselemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Kennzeichnen der geänderten Relationen mit "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5674,10 +5710,10 @@
 "Relationen hinzugefügt wird.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Schlüssel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
@@ -5686,5 +5722,5 @@
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5692,5 +5728,5 @@
 msgstr "Wert:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5699,5 +5735,5 @@
 "<strong><tt>Mitglieder überprüfen</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5716,5 +5752,5 @@
 "tritt in der Relation an die Stelle des ursprünglichen ersten Weges.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5734,5 +5770,5 @@
 "ursprünglichen ersten Knotens.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Rolle zu allen Elementen hinzufügen."
@@ -5885,5 +5921,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -6004,5 +6040,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -6010,5 +6046,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -6016,5 +6052,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -6022,5 +6058,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -6028,5 +6064,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -6035,5 +6071,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6041,5 +6077,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6047,5 +6083,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6053,24 +6089,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filter aktiv</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> Objekte versteckt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> Objekte ausgeblendet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
@@ -6091,5 +6127,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6114,37 +6150,37 @@
 msgstr "Erweiterte Objektinformationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Koordinaten des neuen Knotens eingeben."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Verwenden Sie Angaben in Dezimalgrad."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative Werte für die westliche oder südliche Hemisphere."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Bitte eine gültige Breite im Bereich -90..90 eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Bitte eine Breite im Bereich -90..90 eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Bitte eine gültige Länge im Bereich -180..180 eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Bitte eine Länge im Bereich -180..180 eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Dialog schließen und neuen Knoten anlegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Dialog schließen, keinen neuen Knoten anlegen"
@@ -6200,9 +6236,9 @@
 msgstr "Ebeneninformation"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relationen"
@@ -6252,10 +6288,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Unvollständige Elemente der ausgewählten Relationen herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Unvollständige Elemente herunterladen"
@@ -6275,37 +6311,37 @@
 msgstr "Ein Fenster mit der aktuellen Auswahl öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Nach Objekten suchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Auf Auswahl zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Auf ausgewählte Elemente zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Editor für Relation aufrufen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Relationseditor für die ausgewählte Relation aufrufen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6314,27 +6350,27 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Auswahl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Detaillierte Informationen über internen Objektstatus erhalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Inspizieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Ansicht separat darstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6343,5 +6379,5 @@
 "Werkzeugleiste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
@@ -6634,13 +6670,13 @@
 msgstr "Nichts zum Zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Der Inhalt dieses Änderungssatzes wurde noch nicht heruntergeladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Jetzt herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Inhalt des Änderungssatzes herunterladen"
@@ -6752,4 +6788,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6768,6 +6808,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6785,8 +6823,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6797,4 +6842,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6809,33 +6860,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6859,12 +6899,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6936,10 +6986,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6969,8 +7023,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -7033,6 +7083,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7085,4 +7133,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7147,32 +7207,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7181,6 +7249,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7189,24 +7259,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7221,82 +7281,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7377,155 +7437,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Name"
@@ -7996,4 +8061,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<unterschiedlich>"
@@ -8538,17 +8604,17 @@
 "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "Direkte Kinder von Elternrelationen einbeziehen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Lade Elternrelationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Elternrelationen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Die ausgewählte Relation bearbeiten"
@@ -8838,4 +8904,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8843,15 +8910,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Typ"
@@ -8870,16 +8937,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "unbekannt"
@@ -9520,5 +9587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Auswahldialog für Datei öffnen"
@@ -9773,20 +9840,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Ebene"
@@ -10292,5 +10359,63 @@
 msgstr[1] "{0} zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschreibung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} Track"
+msgstr[1] "{0} Tracks"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Zeitraum"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Länge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Länge: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} Route, "
+msgstr[1] "{0} Routen, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} Wegpunkt"
+msgstr[1] "{0} Wegpunkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10298,62 +10423,17 @@
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschreibung: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} Track"
 msgstr[1] "{0} Tracks"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Zeitraum"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Länge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Länge: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} Route, "
-msgstr[1] "{0} Routen, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} Wegpunkt"
-msgstr[1] "{0} Wegpunkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10363,10 +10443,10 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10377,7 +10457,7 @@
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10385,10 +10465,10 @@
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10396,10 +10476,10 @@
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10407,21 +10487,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Herunterladen nahe bei:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "nur Weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "nur Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "Weg und Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10433,5 +10513,5 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -10439,5 +10519,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10447,5 +10527,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10455,30 +10535,30 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Globale Einstellungen verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Linienaussehen wählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10486,5 +10566,5 @@
 msgstr "Farben anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10493,5 +10573,5 @@
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10500,18 +10580,18 @@
 msgstr "Farbe auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Marken von benannten Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benannte GPS-Punkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Audio importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10524,23 +10604,23 @@
 "Audiodaten verknüpft werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import nicht möglich"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10998,15 +11078,15 @@
 msgstr "Bilddatei konnte nicht gelöscht werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Kein Bild"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "{0} herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -12075,4 +12155,48 @@
 msgid "Voice recorder calibration"
 msgstr "Kalibrierung der Tonaufzeichnung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Aktualisierungsintervall (in Tagen):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Standardwert ist ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Sicherungsdatei"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Einstellungen für Sicherungsdateien"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12157,5 +12281,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Auto"
@@ -12174,16 +12298,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Fahrrad"
@@ -12217,12 +12341,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Zu Fuß"
@@ -12489,18 +12613,18 @@
 msgstr "Standard (Automatisch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Integrierte Standardsymbole aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Benutzter Stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "MapPaint Stile"
@@ -12852,27 +12976,19 @@
 "benutzt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Sicherungsdatei"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "Identität und Authentifizierung am OSM-Server festlegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Einstellungen zur Benutzung eines Proxy-Servers"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Einstellungen für Sicherungsdateien"
 
 #. 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
@@ -12989,6 +13105,15 @@
 "<br><br>Details: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "Externe Werkzeuge"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13245,12 +13370,4 @@
 "Authentifizierungsmethode ''Basisauthentifizierung'' wird verwendet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Sicherungsdateien erstellen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13458,5 +13575,5 @@
 msgstr "Neues Merkmal hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13467,49 +13584,49 @@
 "''display_values'' muss mit der Anzahl in ''values'' identisch sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mehr Informationen zu dieser Vorlage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Unbekannte Vorraussetzung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Verfügbare Rollen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "Anzahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "Elemente"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "Vorlagenelement Rolle ohne Vorgänger"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "Vorlagenelement ohne Elternelement"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13519,15 +13636,15 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13537,17 +13654,17 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13566,13 +13683,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Search preset"
-msgstr "Such-Voreinstellung"
+msgstr "Vorlage suchen"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr "Zeige Voreinstellungs-Suchdialog"
+msgstr "Vorlagensuchdialog zeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
 msgid "Search presets"
-msgstr "Such-Voreinstellungen"
+msgstr "Vorlagen suchen"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
@@ -14205,5 +14322,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14318,5 +14435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14326,5 +14443,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14398,5 +14515,5 @@
 msgstr "Die Datei \"{0}\" existiert nicht"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14408,10 +14525,10 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Das XML-Element <nd> ist kein unmittelbares Kindelement von <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14419,5 +14536,5 @@
 msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf <nd> des Wegs {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14425,5 +14542,5 @@
 msgstr "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element <nd>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14431,5 +14548,5 @@
 msgstr "Der gelöschte Weg {0} enthält Knoten"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -14438,5 +14555,5 @@
 "gefunden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14444,5 +14561,5 @@
 msgstr "Fehlendes Attribut \"ref\" bei Element der Relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14451,5 +14568,5 @@
 "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14457,5 +14574,5 @@
 msgstr "Fehlendes Attribut \"type\" bei Element {0} der Relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14466,10 +14583,10 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member>-Beschreibung mit ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14477,9 +14594,9 @@
 msgstr "Die gelöschte Relation {0} enhält noch Elemente"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "Fehlender Schlüssel oder Wert im Merkmal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14489,11 +14606,11 @@
 "Dieses wird ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Illegales Objekt mit id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14507,8 +14624,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14525,5 +14642,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14531,5 +14648,5 @@
 msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14538,6 +14655,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14551,6 +14668,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14559,5 +14676,5 @@
 msgstr "Ungültiger Wert {0} für das Attribut \"changeset\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14565,5 +14682,5 @@
 msgstr "Fehlendes erforderliches Attribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14571,5 +14688,5 @@
 msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
@@ -14580,5 +14697,5 @@
 "mit externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14586,5 +14703,5 @@
 msgstr "Gelöschter Knoten {0} ist Teil des Weges {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14596,5 +14713,5 @@
 "Knoten nicht in den geladenen Daten enthalten war."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14606,5 +14723,5 @@
 "externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14612,17 +14729,17 @@
 msgstr "Gelöschtes Element {0} wird in der Relation {1} verwendet"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "OSM-Daten einlesen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Datensatz wird vorbereitet ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15171,11 +15288,11 @@
 msgstr "Lade Plugin-Liste herunter..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Herunterladen der Plugin-Liste von ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15186,16 +15303,16 @@
 "Kann die Plugin-Liste der Quelle ''{1}'' nicht zwischenspeichern."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Schreibe Plugin-Liste in den lokalen Zwischenspeicher ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Lese Plugin-Liste von Quelle ''{0}'' ein"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15206,5 +15323,5 @@
 "wird ausgelassen. Die Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15225,13 +15342,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Keine Aktion"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Programmfehler melden"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15243,9 +15360,9 @@
 "einen Fehlerbericht freuen."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Unerwarteter Fehler"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -15256,5 +15373,5 @@
 "Fehlerbericht schicken:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -15265,5 +15382,5 @@
 "Adresse:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15275,5 +15392,5 @@
 "reproduziert werden kann. Beschreiben Sie so detailliert wie möglich."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -15283,9 +15400,9 @@
 "Fehlerbericht im Formular unter der folgenden Adresse eintragen:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Sie sind auf einen Fehler in JOSM gestoßen."
@@ -15546,5 +15663,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15609,5 +15726,5 @@
 msgstr "unbenutzt"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15621,5 +15738,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15629,5 +15746,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15638,5 +15755,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)"
@@ -15755,5 +15872,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Sichtbarkeit"
@@ -15840,10 +15957,62 @@
 msgstr "GPS-Spuren zu openstreetmap.org hochladen"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Öffnungszeiten"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Ändere Eigenschaften für bis zu {0} Objekt"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Wählen"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Weg {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Werkzeug: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Fehler im Filter"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "offen"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -16021,58 +16190,59 @@
 msgstr "Wege ausrichten"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"Verbundene Wegsegemente können nicht ausgerichtet werden.\n"
-"Bitte Wegsegmente wählen, die keine Knoten gemeinsam haben."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "Wege ausrichten: Nachricht"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"Ausrichten würde Knoten außerhalb des aktiven Datenbereiches verschieben.\n"
+"Die Aktion wurde zurückgesetzt."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Bereit!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "Tipps zum Wegausrichten"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Wegausrichten-Modus"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Wegsegment ausrichten"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' darf nicht null sein"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"Auszurichtendes Segment kann nicht mit Referenzsegment identisch sein.\n"
+"Bitte ein anderes Segment zum Ausrichten auswählen."
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
 msgstr "Wege ausrichten: Nachricht"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"Ausrichten würde Knoten außerhalb des aktiven Datenbereiches verschieben.\n"
-"Die Aktion wurde zurückgesetzt."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Bereit!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "Tipps zum Wegausrichten"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "Wegausrichten-Modus"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "Wegsegment ausrichten"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' darf nicht null sein"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"Auszurichtendes Segment kann nicht mit Referenzsegment identisch sein.\n"
-"Bitte ein anderes Segment zum Ausrichten auswählen."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -16228,27 +16398,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Segmente ausrichten.</b> Drücken von <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternativ ist das Kommando im <b>Werkzeuge</"
-"b>menü oder kann in der <b>Werkzeugleiste</b> platziert werden.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -16270,5 +16421,5 @@
 "\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "Nicht noch einmal zeigen"
@@ -16382,5 +16533,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Gebäude"
@@ -16635,5 +16786,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -17083,8 +17234,4 @@
 msgstr "Ost"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Nord"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -17208,6 +17355,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Leere Ebene"
@@ -18611,5 +18758,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
@@ -18653,48 +18800,53 @@
 msgstr "Spuren"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Wegpunkte"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "Daten vom API herunterladen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "Importiere Daten von {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "Erstelle neue Objekte"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "Auswahl ändern"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "Ansicht wechseln"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr "Protokollversion lesen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle Fernsteueraktionen manuell bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Fernbedienung"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Einstellungen für das Fernbedienungs-Plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18706,41 +18858,40 @@
 "Anwendungen adressiert werden muss, die das Plugin nutzen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Erlaubte Aktionen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Soll dies erlaubt werden?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Fernsteueraktion bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
-"Das Fernsteuer-Plugin wurde gefragt, ob es einen neuen Knoten erstellen kann."
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+msgstr "Die Fernsteuerung soll einen neuen Knoten erstellen."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Die Fernsteuerung soll Daten von der API herunterladen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Details der Anfrage: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
 "web sites to detect a running JOSM."
 msgstr ""
-"Eine Anfrage nach der Protokollversion wurde an Remote Control gestellt. "
-"Damit können Webseiten ein laufendes JOSM erkennen."
+"Die Fernsteuerung soll Auskunft über die Protokollversion geben. Damit "
+"können Webseiten ein laufendes JOSM erkennen."
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
@@ -18963,58 +19114,58 @@
 msgstr "Unnötige Knoten aus Flächen entfernen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Autom. Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Kachel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Kachelinformationen anzeigen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Alle Kacheln laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Zoom erhöhen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Zoom reduzieren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "An Kachelgröße anpassen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Kachel-Zwischenspeicher leeren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "Bild "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "Automatisch Zoomen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "Kacheln automatisch laden"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Einstellungen für das Karten-Plugin."
@@ -19303,11 +19454,10 @@
 msgstr "Abteilen"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "SeaMap-Symbole bearbeiten"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr "OpenSeaMap bearbeiten"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr "Seezeicheneditor"
@@ -20481,5 +20631,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20606,59 +20756,59 @@
 msgstr "Überlappende Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "Relationsprüfer :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Diese Erweiterung prüft auf Fehler in Relationen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Relationstyp unbekannt"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "Relation ist leer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<leer>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "Rolle {0} fehlt"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Problem bei Rollenprüfung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "Anzahl der {0}-Rollen ist zu klein ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "Anzahl der {0}-Rollen ist zu hoch ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "Element für Rolle {0} hat falschen Typ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "Rolle {0} unbekannt"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "Leere Rolle gefunden"
@@ -21153,144 +21303,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% der GPS-Spur"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Zeigt die aktuelle Position im Video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Video importieren"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Ein Video mit dieser GPS-Spur synchronisieren"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Video entfernen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "Aktuelles Video aus Ebene entfernen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "Abspielen/Pause"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "Videoabspielen starten/anhalten"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "rückwärts"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr "n Sekunden zurückspringen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "Bodenschwelle"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr "Anspringen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+msgstr "Auf eingestellte GPS-Zeit springen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Bitte geben Sie einen Kachelindex ein"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "Bitte GPS-Timecode eingeben"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "vorwärts"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr "n Sekunden vorwärtsspringen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "schneller"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "schneller abspielen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "langsamer"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "langsamer abspielen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "Schleife"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr "Schleife von n Sekunden um aktuelle Position"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Zentriert halten"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "Dem Videosymbol automatisch folgen"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Zauntreppe"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr "Untertitel"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Zeigt die aktuelle Position im Video"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr "Untertitel im Video anzeigen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Sprungweite"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Weite eines Spungs festlegen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "Im Video x ms springen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Schleifenlänge"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Länge um einen Schleifenpunkt festlegen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr "Kein Deinterlacing"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr "Deinterlacing mittels Zeilenverdopplung"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr "Deinterlacing mit linearer Interpolation"
@@ -21310,7 +21456,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "mehrere"
+msgstr "Stumm schalten"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21425,16 +21570,15 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Mit der angegebenen Suche auswählen"
+msgstr "Wegpunkt zum Bewegen der Karte wählen"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Wegpunkte"
+msgstr "Wegpunktsuche"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
+"Wegpunkt suchen. Klicken und Karte bewegen, um den Wegpunkt anzuzeigen."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
@@ -21447,9 +21591,9 @@
 msgstr "Nichverzweigenden Sequenz von Wegen auswählen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Fehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Nicht im Zwischenspeicher"
@@ -21510,21 +21654,21 @@
 msgstr "Die Position der gewählten WMS-Ebene anpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Bitte wählen Sie die zu justierende WMS-Ebene."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "WMS-Ebene wählen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Justierung starten"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Es existieren momentan keine justierbaren WMS-Ebenen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Keine Ebenen zum Justieren"
@@ -21535,5 +21679,5 @@
 msgstr "Lade WMS-Ebene aus Datei {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21543,5 +21687,5 @@
 "Achtung: Die Adresse \"{0}\" des WMS-Dienstes enthält kein ''&'' oder ''?''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21551,10 +21695,10 @@
 "Einstellungen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Achtung: Die vollständige URL lautet \"{0}\""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21565,5 +21709,5 @@
 "nicht identisch. Das kann zu falschen Koordinaten führen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21572,19 +21716,19 @@
 "ungültiges Format hat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(deaktiviert)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21599,17 +21743,17 @@
 "heruntergeladen werden?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21618,58 +21762,83 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "WMS-Lesezeichen erstellen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatisches Laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Kartenobjekt wurde nicht gefunden."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden"
@@ -21735,11 +21904,10 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
 msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
+msgstr "Erlaube Fernsteuerung (erfordert remotecontrol-Plugin)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
+msgstr "Die Fernsteuerung soll eine WMS-Ebene von folgender URL laden:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22265,16 +22433,21 @@
 "Mausbewegung nur schwer möglich ist (generelles Java - Tablet Problem)"
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Zeigt ein OpenLayers-Hintergrundbild"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22284,5 +22457,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22291,5 +22464,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22300,5 +22473,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22309,10 +22482,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22322,15 +22495,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen, Kommandos an JOSM zu senden."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Plugin zum Umkehren von Änderungssätzen"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22344,5 +22517,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22353,10 +22526,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22368,5 +22541,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22377,15 +22550,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22398,15 +22571,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Seezeichen für OpenSeaMap erstellen und bearbeiten"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22417,5 +22590,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22426,5 +22599,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22435,10 +22608,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22450,5 +22623,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22461,5 +22634,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22471,20 +22644,21 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
+"Erlaubt die Suche nach einem aus einer GPX-Datei importierten Waypoint."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Eine Reihe von nichtverzweigenden verbundenen Wegen auswählen"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22495,5 +22669,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22537,4 +22711,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22567,10 +22742,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Straßen"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Straßen"
@@ -22581,5 +22756,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autobahn"
@@ -22588,5 +22763,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Autobahn bearbeiten"
@@ -22623,10 +22798,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referenz"
@@ -22640,8 +22815,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Spuren"
@@ -22660,13 +22835,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -22700,17 +22875,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -22747,17 +22922,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22791,17 +22966,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -22832,17 +23007,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Senke"
@@ -22873,17 +23048,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -22891,5 +23066,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Autobahnanschluß"
@@ -22898,5 +23073,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Autobahnanschluß bearbeiten"
@@ -22904,5 +23079,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Schnellstraße"
@@ -22911,5 +23086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Schnellstraße bearbeiten"
@@ -22919,6 +23094,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Kraftfahrstraße"
@@ -22926,5 +23101,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Schnellstraßenanschluß"
@@ -22933,5 +23108,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Schnellstraßenanschluß bearbeiten"
@@ -22944,5 +23119,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Bundesstraße"
@@ -22951,5 +23126,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Bundesstraße bearbeiten"
@@ -22957,10 +23132,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Bundesstraßenanschluß"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Bundesstraßenanschluß bearbeiten"
@@ -22972,5 +23147,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Landesstraße"
@@ -22980,5 +23155,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Landesstraße bearbeiten"
@@ -22986,5 +23161,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Kreisstraße"
@@ -22994,5 +23169,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Kreisstraße bearbeiten"
@@ -23004,5 +23179,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Verbindungsstraße"
@@ -23012,5 +23187,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Verbindungsstraße bearbeiten"
@@ -23020,6 +23195,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Ausweichstellen"
@@ -23042,15 +23217,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -23062,5 +23237,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ortsstraße"
@@ -23069,5 +23244,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Ortsstraße bearbeiten"
@@ -23087,12 +23262,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Oberfläche"
@@ -23114,166 +23289,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "befestigt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "unbefestigt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asphaltiert"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "Beton"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "Metall"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "Holz"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "Gehwegplatte/Pflaster"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "Kopfsteinpflaster"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "Schotter"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "Kies"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "verdichtet"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "Rasengitterstein"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "Gras"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "Sand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "Erde"
@@ -23281,5 +23456,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Spielstraße"
@@ -23288,5 +23463,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Spielstraße bearbeiten"
@@ -23294,5 +23469,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Fußgängerzone"
@@ -23301,5 +23476,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Fußgängerzone bearbeiten"
@@ -23307,5 +23482,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Zufahrtsstraße"
@@ -23314,5 +23489,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Zufahrtsstraße bearbeiten"
@@ -23322,18 +23497,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Zufahrtsstraßentyp"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "Gasse"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "Auffahrt"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "Parkplatzweg"
@@ -23341,5 +23516,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Parkplatzweg"
@@ -23349,10 +23524,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Parkplatzweg bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Unbekannter Straßentyp"
@@ -23361,5 +23536,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Straße mit unbekanntem Typ bearbeiten"
@@ -23367,14 +23542,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Baustelle"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Eine im Bau befindliche Straße bearbeiten"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Kreuzung"
@@ -23390,5 +23565,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -23397,5 +23572,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Straßenbeschränkungen"
@@ -23404,15 +23579,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Straßenbeschränkungen bearbeiten"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Maut"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Kein Ausgang (Sackgasse)"
@@ -23420,5 +23595,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Genereller Zugang"
@@ -23444,4 +23619,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23449,4 +23625,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23522,236 +23704,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "Privat"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:219
+msgid "destination"
+msgstr "Anlieger frei"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "Privat; Zugang gestattet"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "Landwirtschaftlicher Verkehr gestattet"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "Forstwirtschaftlicher Verkehr gestattet"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "Lieferverkehr frei"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nein"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Landwirtschaft"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "Bezeichnete/vorgesehene Nutzungsart"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "Privat"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "Anlieger frei"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "Privat; Zugang gestattet"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "Landwirtschaftlicher Verkehr gestattet"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "Forstwirtschaftlicher Verkehr gestattet"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "Lieferverkehr frei"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nein"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Landwirtschaft"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "Bezeichnete/vorgesehene Nutzungsart"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "Offizielle Nutzungsart"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Kleinlaster"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "LKW"
@@ -23766,10 +23955,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Pferd"
@@ -23785,10 +23974,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorrad"
@@ -23803,19 +23993,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Öffentlicher Verkehr & Taxi"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. Geschwindigkeit (km/h)"
@@ -23823,20 +24013,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. Gewicht (Tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Max. Höhe (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Max. Breite (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Max. Länge (Meter)"
@@ -23844,5 +24034,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -23853,5 +24043,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Kreuzung bearbeiten"
@@ -23871,10 +24061,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobahn"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Autobahnanschluß"
@@ -23896,10 +24086,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Schnellstraße"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "Schnellstraßenanschluß"
@@ -23921,10 +24111,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "Bundesstraße"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "Bundesstraßenanschluß"
@@ -23946,5 +24136,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23959,9 +24149,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "Kreisstraße"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "Verbindungsstraße"
@@ -23975,9 +24165,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "Ortsstraße"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "Spielstraße"
@@ -24021,10 +24211,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "Service"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "Spurbus"
@@ -24054,5 +24244,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -24064,10 +24254,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Brücke bearbeiten"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Tunnel bearbeiten"
@@ -24075,10 +24265,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Wege"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Feld- oder Waldweg"
@@ -24087,35 +24277,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Feld- oder Waldweg bearbeiten"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Typ des Weges"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "Grad 1 (Asphalt)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "Grad 2 (Schotter)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "Grad 3 (unbefestigt)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "Grad 4 (leicht bewachsen)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "Grad 5 (stark bewachsen)"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB-Skala"
@@ -24123,5 +24313,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Pfad"
@@ -24130,76 +24320,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Pfad bearbeiten"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC-Skala"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "Bergwanderweg"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "Anspruchsvoller Bergwanderweg"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "Alpiner Wanderweg"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "Anspruchsvoller alpiner Wanderweg"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "Schwerer alpiner Wanderweg"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "exzellent"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "gut"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "schlecht"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "sehr schlecht"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Rollstuhl"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Schneemobil"
@@ -24208,5 +24398,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Ausgewiesener Reitweg"
@@ -24214,5 +24404,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Reitweg bearbeiten"
@@ -24220,5 +24410,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Ausgewiesener Fahrradweg"
@@ -24236,11 +24426,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Fahrradweg bearbeiten"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Fußgänger"
@@ -24248,5 +24438,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Geteilter Fuß- und Fahradweg"
@@ -24254,5 +24444,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinierter Fuß- und Fahrradweg"
@@ -24260,5 +24450,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Ausgewiesener Fußweg"
@@ -24267,5 +24457,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Fußweg bearbeiten"
@@ -24273,5 +24463,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Treppe"
@@ -24281,10 +24471,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Treppe bearbeiten"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Anzahl der Sitzplätze"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Anschlussstelle"
@@ -24292,15 +24488,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Anschlussstelle bearbeiten"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Rastplatz / Autohof"
@@ -24308,5 +24504,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Rastplatz / Autohof bearbeiten"
@@ -24314,10 +24510,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -24346,36 +24543,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Betreiber"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Wiederherstellen"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Restaurant bearbeiten"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Notfalltelefon"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Ampel"
@@ -24385,5 +24603,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Typ des Fußgängerüberwegs"
@@ -24392,27 +24610,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "Ampel"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "Insel"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "unmarkiert"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -24420,6 +24638,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -24428,11 +24646,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Schülerlotse"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Übergangstyp (UK)"
@@ -24440,30 +24658,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "Zebrastreifen"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "Ampel (Pelikan)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "Fußgängerampel (Toukan)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "Fußgängerampel (Puffin)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stopp-Schild"
@@ -24471,67 +24689,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Fußgängerüberweg"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Fußgängerüberweg bearbeiten"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Typname (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Verkehrsberuhigung"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Verkehrsberuhigung bearbeiten"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "Bodenschwelle"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "Schikane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "Fahrbahnverengung"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "Bodenwelle (mit Lücken)"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "Bodenwelle (lang)"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "Bodenwelle (sehr lang und flach)"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Ausweichstelle"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Ausweichstelle bearbeiten"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Kleiner Kreisverkehr"
@@ -24542,14 +24698,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Richtung"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "Im Uhrzeigersinn"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Fußgängerüberweg"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Fußgängerüberweg bearbeiten"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Typname (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Verkehrsberuhigung"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Verkehrsberuhigung bearbeiten"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "Bodenschwelle"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "Schikane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "Fahrbahnverengung"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "Bodenwelle (mit Lücken)"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "Bodenwelle (lang)"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "Bodenwelle (sehr lang und flach)"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Ausweichstelle"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+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:707
 msgid "Turning Circle"
 msgstr "Wendestelle"
@@ -24559,5 +24777,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Ortseingangsschild"
@@ -24565,15 +24783,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Ortseingangsschild bearbeiten"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Zweiter Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
@@ -24582,11 +24800,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Notfalltelefon"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Steigung"
@@ -24594,5 +24807,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Starke Steigung"
@@ -24600,5 +24813,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Splittbehälter"
@@ -24608,10 +24821,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Furt"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Furt bearbeiten"
@@ -24619,5 +24832,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Gebirgspass"
@@ -24625,5 +24838,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Gebirgspass bearbeiten"
@@ -24632,10 +24845,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Höhe"
@@ -24643,5 +24856,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barrieren"
@@ -24649,5 +24862,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Poller"
@@ -24655,5 +24868,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Poller bearbeiten"
@@ -24698,16 +24911,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Umlaufgitter"
@@ -24716,5 +24929,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Steinblock"
@@ -24722,5 +24935,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Viehgitter"
@@ -24728,10 +24941,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Viehgitter bearbeiten"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Busschleuse"
@@ -24739,15 +24952,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Spikes / Dornen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Spikes / Dornen bearbeiten"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Mautstation"
@@ -24755,5 +24968,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Mautstation bearbeiten"
@@ -24761,10 +24974,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Grenzkontolle"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Grenzkontrolle bearbeiten"
@@ -24773,5 +24986,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Hecke"
@@ -24782,22 +24995,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Zaun"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "Zaun"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "Holzzaun"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "Holzzaun"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Mauer"
@@ -24805,5 +25018,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Stadtmauer"
@@ -24812,5 +25025,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Stützmauer"
@@ -24821,10 +25034,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Eingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Eingang bearbeiten"
@@ -24832,5 +25045,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Gatter / Tor"
@@ -24838,50 +25051,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Gatter / Tor bearbeiten"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Schlagbaum"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Schlagbaum bearbeiten"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Drahtgatter"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Drahtgatter bearbeiten"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Fahrzeuggatter"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Fahrzeuggatter bearbeiten"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Zauntreppe"
@@ -24889,25 +25102,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Zauntreppe bearbeiten"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Drehsperre"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Drehsperre bearbeiten"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
@@ -24915,25 +25128,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Wasser"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Quelle"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Quelle bearbeiten"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -24941,10 +25143,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Wassergraben"
@@ -24952,10 +25154,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Wassergraben bearbeiten"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Bach"
@@ -24963,10 +25165,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanal"
@@ -24974,10 +25176,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Fluss"
@@ -24987,59 +25189,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Quelle"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Quelle bearbeiten"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Wasserfall"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Wasserfall bearbeiten"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Wehr"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Wehr bearbeiten"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Damm"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Damm bearbeiten"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Wasserbecken"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Wasserbecken bearbeiten"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Speicherbecken"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Speicherbecken bearbeiten"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Überdecktes Speicherbassin"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Überdecktes Speicherbassin bearbeiten"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Wasserbecken"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Wasserbecken bearbeiten"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Speicherbecken"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Speicherbecken bearbeiten"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Überdecktes Speicherbassin"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Überdecktes Speicherbassin bearbeiten"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Küstenlinie"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Küstenlinie bearbeiten"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Flussbett"
@@ -25048,10 +25304,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Flussbett bearbeiten"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -25062,14 +25319,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "Moor"
@@ -25083,35 +25340,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "Mangroven"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Strand"
@@ -25119,20 +25376,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Klippe"
@@ -25140,145 +25397,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Küstenlinie"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Küstenlinie bearbeiten"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Einkaufen"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Fährstelle"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Fährstelle bearbeiten"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Auto"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "Anfänger"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "Fahrrad"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Fährroute"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Bootswerft"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Bootswerft bearbeiten"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dock"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Dock bearbeiten"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Damm"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Damm bearbeiten"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Gewässerpunkte"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Jachthafen"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Jachthafen bearbeiten"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Anlegestelle (Pier)"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Anlegestelle (Pier) bearbeiten"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Schleusentor"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Wehr"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Wehr bearbeiten"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Wasserfall"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Wasserfall bearbeiten"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Wendepunkt"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Jachthafen"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Jachthafen bearbeiten"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Anlegestelle (Pier)"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Anlegestelle (Pier) bearbeiten"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Fährstelle"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Fährstelle bearbeiten"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Bootshebeanlage"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -25288,16 +25616,38 @@
 msgstr "Bootshebeanlage bearbeiten"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Bootswerft"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Bootswerft bearbeiten"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dock"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Dock bearbeiten"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -25305,5 +25655,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -25333,7 +25683,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Spurweite (mm)"
@@ -25349,8 +25699,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Arten"
@@ -25364,29 +25714,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "Rangiergleis"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "Abstellgleis"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "Firmenanschlußgleis"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elektrifiziert"
@@ -25399,8 +25749,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "Oberleitung"
@@ -25471,8 +25821,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25484,8 +25834,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Spannung"
@@ -25498,8 +25848,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frequenz (Hz)"
@@ -25512,23 +25862,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16,7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Schmalspurbahn"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Schmalspurbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Einschienenbahn"
@@ -25536,50 +25886,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Einschienenbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Museumsbahn"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Museumsbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Stadtbahn"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Stadtbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "U-Bahn"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "U-Bahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Straßenbahn"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Straßenbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Spurbus"
@@ -25587,5 +25937,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Spurbusstrecke bearbeiten"
@@ -25594,10 +25944,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Stillgelegte Strecke"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Stillgelegte Strecke bearbeiten"
@@ -25606,9 +25956,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Optionale Typen"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -25617,5 +25967,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -25624,5 +25974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -25632,5 +25982,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Art des Übergangs"
@@ -25638,5 +25988,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -25645,5 +25995,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Prellbock"
@@ -25652,10 +26002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Seilbahnen"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -25663,10 +26013,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -25674,10 +26024,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Seilbahn"
@@ -25685,10 +26035,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Seilbahn bearbeiten"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondelbahn"
@@ -25696,10 +26046,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25708,5 +26059,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25714,5 +26065,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25721,5 +26072,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25727,5 +26078,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -25735,69 +26086,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "Land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Freie Tankstelle"
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25814,34 +26188,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25849,37 +26224,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25900,33 +26286,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25935,170 +26323,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 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:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "Mit Kiosk"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Tante-Emma-Laden"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Kraftstoffsorten:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 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:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel für LKW"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Normalbenzin"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Super"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Super plus"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 Oktan"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Flüssiggas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (komprimiertes Erdgas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 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:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "1:50 Gemisch (Mofa/Moped)"
@@ -26106,4 +26516,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -26115,6 +26526,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parken"
@@ -26123,5 +26534,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -26132,25 +26543,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referenznummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "ebenerdig"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "Tiefgarage"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -26159,54 +26572,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Gebühr"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Gesamtkapazität"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Stellplätze für Frauen"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Stellplätze für Eltern"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Autohändler"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Autohaus bearbeiten"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Arten"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Baum bearbeiten"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Inhalt"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Faxnummer"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Webseite"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Vermietung"
@@ -26215,10 +26772,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -26226,28 +26782,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Fahrradparkplatz bearbeiten"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Kapazität"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorrad"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Autobahn bearbeiten"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Rastplatz / Autohof"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Skalierung"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "schlecht"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Vorlagen"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Kleidung"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Kapazität"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Fahrradladen"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Fahrradladen bearbeiten"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -26257,5 +26872,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -26263,5 +26878,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -26269,5 +26884,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -26275,5 +26890,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -26281,5 +26896,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -26288,5 +26903,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -26294,5 +26909,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -26301,5 +26916,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -26311,5 +26926,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -26317,10 +26932,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -26329,10 +26944,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -26341,5 +26956,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -26348,5 +26963,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -26354,5 +26969,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -26362,13 +26977,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -26376,19 +26990,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Sitzbank"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Blindenleitbelag"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -26396,5 +27010,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -26402,5 +27016,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -26408,10 +27022,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Flughafen"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Flugplatz"
@@ -26419,5 +27033,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Flugplatz bearbeiten"
@@ -26425,10 +27039,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -26437,5 +27051,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Start-/Landebahn"
@@ -26443,5 +27057,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Start-/Landebahn bearbeiten"
@@ -26449,5 +27063,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Rollbahn"
@@ -26455,5 +27069,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Rollbahn bearbeiten"
@@ -26461,5 +27075,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Hubschrauberlandeplatz"
@@ -26467,5 +27081,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Hubschrauberlandeplatz bearbeiten"
@@ -26475,5 +27089,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Vorfeld"
@@ -26483,5 +27097,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -26492,6 +27106,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Bake"
@@ -26501,5 +27115,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Windsack"
@@ -26508,5 +27122,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -26514,5 +27128,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Terminal bearbeiten"
@@ -26520,15 +27134,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Terminal-Gate bearbeiten"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Reisen"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -26540,5 +27154,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -26547,5 +27161,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
@@ -26558,8 +27172,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Sterne"
@@ -26583,34 +27197,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr "Internetzugang"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr "WLAN"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr "Kabel"
@@ -26624,168 +27238,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "Terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr "Internetgebühr"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr "Rauchen"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr "gewidmet"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr "separat"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr "isoliert"
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr "Faxnummer"
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr "Webseite"
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr "E-Mail-Adresse"
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26793,20 +27312,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -26814,10 +27333,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -26825,30 +27344,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -26856,10 +27376,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -26870,5 +27390,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26876,5 +27396,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -26882,5 +27402,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Küche"
@@ -26888,79 +27410,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "französisch"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "Sandwich"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "Sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr "Kleinbrauerei"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -26968,18 +27490,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "Fish and Chips"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "Hähnchen"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr "Food Court"
@@ -26987,10 +27509,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr "Food Court bearbeiten"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Café"
@@ -26998,10 +27520,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Kneipe"
@@ -27009,20 +27536,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -27030,10 +27557,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -27041,25 +27568,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -27067,9 +27594,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -27078,9 +27605,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Themenpark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Themenpark bearbeiten"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Kunstausstellung"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Kunstausstellung bearbeiten"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -27088,50 +27636,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Themenpark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Themenpark bearbeiten"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Kunstausstellung"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Kunstausstellung bearbeiten"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Schutzraum bearbeiten"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Feuerstelle"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Picknickplatz"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Picknickplatz bearbeiten"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Informationsbüro"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topographisch"
@@ -27169,5 +27718,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -27175,28 +27724,28 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "schematisch"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -27206,5 +27755,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Dargestellte Routen für:"
@@ -27212,5 +27761,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -27218,6 +27767,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Radfahren"
@@ -27225,5 +27774,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -27231,6 +27780,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skifahren"
@@ -27238,5 +27787,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Reiten"
@@ -27244,46 +27793,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Inhalt"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr "Fahnenmast"
@@ -27292,5 +27841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informationsterminal"
@@ -27298,55 +27847,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Schutzraum bearbeiten"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Feuerstelle"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Picknickplatz"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Picknickplatz bearbeiten"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -27355,19 +27883,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -27376,9 +27904,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -27386,10 +27914,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Paläontologische Stätte"
@@ -27397,5 +27925,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Paläontologische Stätte bearbeiten"
@@ -27403,15 +27931,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -27419,55 +27947,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Spielplatz"
@@ -27475,35 +28003,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -27517,6 +28045,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -27932,6 +28460,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27966,240 +28494,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "American Football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "Canadian Football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "Gaelic Football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "Rugby League"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "Rugby Union"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -28216,5 +28744,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -28241,23 +28768,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "Typ"
@@ -28274,5 +28809,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -28299,211 +28833,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "Weg"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motorsport"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Motorsportplatz bearbeiten"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -28511,52 +29048,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Schießen"
@@ -28564,204 +29101,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Australian Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "American Football ändern"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "Canadian Football"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "Canadian Football ändern"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "Gaelic Football"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "Gaelic Football ändern"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "Rugby League"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr "Rugby League ändern"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "Rugby Union ändern"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motorsport"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Motorsportplatz bearbeiten"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Warnung"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Parken bearbeiten"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Autos"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Motorsportplatz bearbeiten"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Eislaufbahn bearbeiten"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Grenzkontrolle bearbeiten"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Auto"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Seilbahn bearbeiten"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Gebäude"
@@ -28769,5 +29372,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -28775,10 +29378,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäude bearbeiten"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Rathaus"
@@ -28786,10 +29389,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Botschaft"
@@ -28797,10 +29400,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Gericht"
@@ -28809,10 +29412,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Gefängnis"
@@ -28821,10 +29424,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polizei"
@@ -28834,10 +29437,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -28846,10 +29449,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Post"
@@ -28857,5 +29460,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -28863,15 +29466,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Schule"
@@ -28879,10 +29482,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universität"
@@ -28890,10 +29493,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Hochschule"
@@ -28901,5 +29504,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -28907,5 +29510,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kino"
@@ -28914,10 +29517,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bibliothek"
@@ -28926,9 +29529,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -28936,10 +29539,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Theater"
@@ -28948,10 +29551,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -28961,5 +29564,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -28968,6 +29571,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -28976,66 +29579,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Konfession"
@@ -29044,189 +29647,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnitisch"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adressen"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Adressinformationen bearbeiten"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Hausnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Hausname"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Straßenname"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Ortsname"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Postleitzahl"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Länderkennung"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Adressinterpolation bearbeiten"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Nummernschema"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "ungerade"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "gerade"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alphabetisch"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Art des Turms"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "Beobachtung"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -29234,25 +29767,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -29260,10 +29793,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Windmühle"
@@ -29271,10 +29804,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -29283,41 +29816,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "Gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "Wärme"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "Abwasser"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "Beliebige Substanz"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Ort"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "Unter Wasser"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "oberirdisch"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -29327,10 +29860,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -29338,5 +29871,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
@@ -29344,10 +29877,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -29355,10 +29888,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -29366,23 +29899,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "im Gebäude"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "im Freien"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "öffentlich"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -29392,35 +29925,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -29429,10 +29962,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -29441,5 +29974,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -29447,10 +29980,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Strommast"
@@ -29461,23 +29994,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "Turm"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -29486,20 +30019,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29507,55 +30040,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "vierfach"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limitiert"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -29564,5 +30097,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -29570,5 +30103,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Münzen"
@@ -29576,5 +30109,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Scheine"
@@ -29582,5 +30115,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -29588,5 +30121,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -29594,15 +30127,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -29611,5 +30144,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -29617,35 +30150,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Dosen"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Kleidung"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Abfalleimer"
@@ -29653,5 +30181,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Abfalleimer bearbeiten"
@@ -29660,31 +30188,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Lehne"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "Kunststoff"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "braun"
@@ -29763,5 +30291,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29771,31 +30299,31 @@
 msgstr "grün"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "grau"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "weiß"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -29803,31 +30331,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -29836,10 +30364,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -29848,10 +30376,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29860,5 +30388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Hydrant bearbeiten"
@@ -29866,501 +30394,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Zu Fuß"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarkt"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Supermarkt bearbeiten"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Tante-Emma-Laden"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Tante-Emma-Laden bearbeiten"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Kiosk bearbeiten"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Fleischer"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Fleischer bearbeiten"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Bäcker"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Bäcker bearbeiten"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Bioladen"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Bioladen bearbeiten"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Spirituosen"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Spirituosengeschäft bearbeiten"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Getränke"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Getränkeladen bearbeiten"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Geschäfte"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Drogerie"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Drogerie bearbeiten"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Friseur"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Friseur bearbeiten"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Optiker bearbeiten"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Computergeschäft bearbeiten"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Schuhe"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Schuhladen bearbeiten"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Camping (Outdoor)"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Sportgeschäft bearbeiten"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Chemische Reinigung"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Chemische Reinigung bearbeiten"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Waschsalon"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Waschsalon bearbeiten"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Eisenbahn-Überlagerung"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Eisenbahn bearbeiten"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Computergeschäft bearbeiten"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronikgeschäft"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Elektronikgeschäft bearbeiten"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Hifi-Geschäft bearbeiten"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Videoverleih"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Videogeschäft bearbeiten"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Blumenladen"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Blumenladen bearbeiten"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Gartenzentrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Gartenzentrum bearbeiten"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Haushaltswaren"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Haushaltswaren bearbeiten"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Heimwerkerbedarf"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Mobiliar"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Möbelgeschäft bearbeiten"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Bürobedarf"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Bürobedarf bearbeiten"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Buchhandlung"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Buchhandlung bearbeiten"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Reisebüro"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Reisebüro bearbeiten"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Spielzeug"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Spielzeuggeschäft bearbeiten"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Verkaufsautomat"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Automaten bearbeiten"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Automatenprodukte"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "Fahrscheine"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "Pläne des öffentlichen Nahverkehrs"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "Parkscheine"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "Essen"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "Getränke"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "Süßigkeiten"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "Zigaretten"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "Fotos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "Tiernahrung"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "Zeitungen"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "Spielzeug"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "Briefmarken"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-Karten"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "Telefonkarten"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "Karten/Belege"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "Fahrradschlauch"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "Kondome"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "Tampons"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "Hundekot-Tüten"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Kundenkarten"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Geld"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Bank"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Bank bearbeiten"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Geldautomat"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Wechselstube"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Wechselstube bearbeiten"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Geldautomat bearbeiten"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Gesundheit"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Arzt"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Arzt bearbeiten"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Zahnarzt"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Zahnarzt bearbeiten"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Apotheke"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Apotheke bearbeiten"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Rezepteinlösung"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Krankenhaus"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Krankenhaus bearbeiten"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Babyklappe"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Geschäfte"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Autohändler"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Autohaus bearbeiten"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Fahrradladen"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Fahrradladen bearbeiten"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarkt"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Supermarkt bearbeiten"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Drogerie"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Drogerie bearbeiten"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Tante-Emma-Laden"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Tante-Emma-Laden bearbeiten"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Kiosk bearbeiten"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Buchhandlung"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Buchhandlung bearbeiten"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Reisebüro"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Reisebüro bearbeiten"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Fleischer"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Fleischer bearbeiten"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Bäcker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Bäcker bearbeiten"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Blumenladen"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Blumenladen bearbeiten"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Bioladen"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Bioladen bearbeiten"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Spirituosen"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Spirituosengeschäft bearbeiten"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Getränke"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Getränkeladen bearbeiten"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Computergeschäft bearbeiten"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronikgeschäft"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Elektronikgeschäft bearbeiten"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Hifi-Geschäft bearbeiten"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Mobiliar"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Möbelgeschäft bearbeiten"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Gartenzentrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Gartenzentrum bearbeiten"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Haushaltswaren"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Haushaltswaren bearbeiten"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Heimwerkerbedarf"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Bürobedarf"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Bürobedarf bearbeiten"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Friseur"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Friseur bearbeiten"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Schuhe"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Schuhladen bearbeiten"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Spielzeug"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Spielzeuggeschäft bearbeiten"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Videoverleih"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Videogeschäft bearbeiten"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Chemische Reinigung"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Chemische Reinigung bearbeiten"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Waschsalon"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Waschsalon bearbeiten"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Camping (Outdoor)"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Sportgeschäft bearbeiten"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Optiker bearbeiten"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Verkaufsautomat"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Automaten bearbeiten"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Automatenprodukte"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "Fahrscheine"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "Pläne des öffentlichen Nahverkehrs"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "Parkscheine"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "Essen"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "Getränke"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "Süßigkeiten"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "Zigaretten"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "Fotos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "Tiernahrung"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "Zeitungen"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "Spielzeug"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "Briefmarken"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-Karten"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "Telefonkarten"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "Karten/Belege"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "Fahrradschlauch"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "Kondome"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "Tampons"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "Hundekot-Tüten"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Kundenkarten"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Geld"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Bank"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Bank bearbeiten"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Geldautomat"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Wechselstube"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Wechselstube bearbeiten"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Geldautomat bearbeiten"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Gesundheit"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Arzt"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Arzt bearbeiten"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Zahnarzt"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Zahnarzt bearbeiten"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Apotheke"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Apotheke bearbeiten"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Rezepteinlösung"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Krankenhaus"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Krankenhaus bearbeiten"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -30369,5 +30899,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -30376,15 +30906,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -30392,5 +30922,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -30399,368 +30929,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Grenzen"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Staat"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Staatsgrenze bearbeiten"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Innerstaatlich"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Innerstaatliche Grenze bearbeiten"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Zivil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Zivilrechtliche Grenze bearbeiten"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politisch"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Politische Grenze bearbeiten"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Nationalpark"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Nationalparkgrenze bearbeiten"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Orte"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Staat"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Bundesland"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Landkreis"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Großstadt"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Stadt"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Stadtteil"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Dorf"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Weiler"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Unbewohnter Ort"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Bergspitze"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Bergspitze bearbeiten"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Gletscher"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Gletscher bearbeiten"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulkan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Vulkan bearbeiten"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Höhleneingang"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Höhleneingang bearbeiten"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Insel"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Kleine Insel"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Natur"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Baum"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Baum bearbeiten"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanischer Name"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Naturwald"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Naturwald bearbeiten"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "Nadelwald"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "Laubwald"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "Mischwald"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Forst"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Forst bearbeiten"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Naturdenkmal & Reservat"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Naturdenkmal oder Reservat bearbeiten"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Höhleneingang"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Höhleneingang bearbeiten"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Bergspitze"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Bergspitze bearbeiten"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Gletscher"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Gletscher bearbeiten"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulkan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Vulkan bearbeiten"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Grenzen"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Staat"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Staatsgrenze bearbeiten"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Innerstaatlich"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Innerstaatliche Grenze bearbeiten"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Zivil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Zivilrechtliche Grenze bearbeiten"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politisch"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Politische Grenze bearbeiten"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Nationalpark"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Nationalparkgrenze bearbeiten"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Geröll"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Geröll bearbeiten"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Gebirge"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Gebirge bearbeiten"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Buschland"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Buschland bearbeiten"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Heide"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Heide bearbeiten"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Baum"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Baum bearbeiten"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanischer Name"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Naturwald"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Naturwald bearbeiten"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "Nadelwald"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "Laubwald"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "Mischwald"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Forst"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Forst bearbeiten"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Naturdenkmal & Reservat"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Naturdenkmal oder Reservat bearbeiten"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Geröll"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Geröll bearbeiten"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Buschland"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Buschland bearbeiten"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Gebirge"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Gebirge bearbeiten"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Heide"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Heide bearbeiten"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -30769,45 +31305,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -30815,25 +31351,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -30841,10 +31377,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -30852,20 +31388,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -30873,5 +31409,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -30879,15 +31415,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -30895,9 +31431,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -30905,39 +31441,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -30945,15 +31481,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -30961,52 +31497,186 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Station"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adressen"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Adressinformationen bearbeiten"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Hausnummer"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Hausname"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Straßenname"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Ortsname"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Postleitzahl"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Länderkennung"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "S"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "O"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Adressinterpolation bearbeiten"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Nummernschema"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "ungerade"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "gerade"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alphabetisch"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Inhalt"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Information zum Autor hinzufügen."
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "Bild "
 
 #. item "Relations/Multipolygon"
@@ -31014,5 +31684,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -31024,5 +31694,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "Äußeres Segment"
@@ -31030,5 +31700,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -31036,5 +31706,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Grenze"
@@ -31045,5 +31715,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Grenze anpassen"
@@ -31051,36 +31721,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Grenztyp"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "national"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "zivil"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "politisch"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Administrationsebene"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Teilgebiet"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Administrationszentrum"
@@ -31088,5 +31758,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -31095,5 +31765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -31101,34 +31771,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -31137,15 +31807,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "Zu Weg"
@@ -31153,5 +31823,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Route"
@@ -31160,5 +31830,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -31166,132 +31836,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Routentyp"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "Fahrrad"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "Ski"
@@ -31359,5 +31918,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31367,9 +31926,9 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "Umleitung"
@@ -31383,10 +31942,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -31394,31 +31953,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -31427,30 +31986,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -35428,7 +35987,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "LandSat"
+msgstr "Landsat (Spiegelserver)"
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35550,8 +36108,48 @@
 msgstr "Sizilien - Italien"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 - Italy"
+
+#~ msgid "Keep backup files"
+#~ msgstr "Sicherungsdateien erstellen"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "Verbundene Wegsegemente können nicht ausgerichtet werden.\n"
+#~ "Bitte Wegsegmente wählen, die keine Knoten gemeinsam haben."
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Segmente ausrichten.</b> Drücken von <b><i><span style=\"color:"
+#~ "green\">Shift-A</span></i></b>. Alternativ ist das Kommando im "
+#~ "<b>Werkzeuge</b>menü oder kann in der <b>Werkzeugleiste</b> platziert "
+#~ "werden.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Gewässerpunkte"
 
 #~ msgid "Create non-audio markers when reading GPX."
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 22859)
+++ applications/editors/josm/i18n/po/el.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-04-20 18:36+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:14+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Προειδοποίηση"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -261,5 +261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -294,5 +294,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -401,4 +401,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -416,5 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1043,5 +1044,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1050,5 +1051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1061,5 +1062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1446,13 +1447,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1461,5 +1462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1467,9 +1468,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1477,5 +1478,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1509,8 +1510,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1519,9 +1520,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1537,6 +1538,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1546,5 +1547,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1569,6 +1570,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Σφάλμα"
@@ -1729,5 +1730,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Όχι, ακύρωση"
@@ -2009,5 +2010,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2478,5 +2479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2520,5 +2521,5 @@
 "Σίγουρα να μετακινηθούν;"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2526,5 +2527,5 @@
 "τετράγωνο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2533,9 +2534,9 @@
 "συγχώνευση με το πλησιέστερο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2797,5 +2798,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -2985,7 +2986,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3250,5 +3251,5 @@
 msgstr[1] "Μετακίνηση {0} κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3402,31 +3403,31 @@
 msgstr "Αυτόματη διόρθωση ετικέτας"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3445,15 +3446,15 @@
 msgstr "Μη αποδεκτή τιμή Γ/Μήκους \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3462,5 +3463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3469,5 +3470,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3476,5 +3477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3483,5 +3484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3489,5 +3490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3496,5 +3497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3503,5 +3504,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3510,5 +3511,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3517,10 +3518,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3640,5 +3641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3710,9 +3711,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3720,5 +3721,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3908,14 +3909,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Ελβετικό πλέγμα (Ελβετία)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "νότια"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Άλμα εκεί"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3940,9 +3960,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3985,5 +4005,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -4004,5 +4024,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4253,69 +4273,69 @@
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Επιλογή γλώσσας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4325,9 +4345,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4337,57 +4357,66 @@
 "αυτή τη σειρά."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Αρχικοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Ενημέρωση πρόσθετων..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Εγκατάσταση ενημερωμένων πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Χρεωστικές Κάρτεσ"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4397,9 +4426,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4413,9 +4442,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4537,23 +4567,23 @@
 msgstr "Χρήστης:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4644,5 +4674,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4650,17 +4680,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4670,25 +4700,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5086,4 +5116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5166,4 +5197,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5180,4 +5212,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5251,5 +5284,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5261,10 +5294,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "καμοία"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "όλα"
@@ -5346,5 +5379,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5356,5 +5389,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5389,17 +5422,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5407,15 +5440,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5423,10 +5456,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5438,5 +5471,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5448,5 +5481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5591,5 +5624,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5702,5 +5735,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5708,5 +5741,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5714,5 +5747,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5720,5 +5753,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5726,5 +5759,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5733,5 +5766,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5739,5 +5772,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5745,5 +5778,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5751,24 +5784,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5789,5 +5822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5812,37 +5845,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Χρησιμοποιήστε δεκαδικές μοίρες"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Αρνητικές τιμές υποδεικνείουν  Δυτικό/Νότιο ημισφαίριο."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό πλάτος στην κλίμακα -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Παρακαλώ εισάγεται ενα γεωγραφικό πλάτος στην κλίμακα -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό μήκος στην κλίμακα -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Παρακαλώ εισάγεται ενα γεωγραφικό μήκος στην κλίμακα -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Κλείσε το διάλογο και δημιούργησε ένα νέο κόμβο"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Κλείσε το διάλογο, χωρίς δημιουργία νέου κόμβου"
@@ -5898,9 +5931,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -5948,10 +5981,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5971,37 +6004,37 @@
 msgstr "Άνοιγμα παραθύρου λίστας επιλεγμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Ζουμ στην επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Ζούμ στα επιλεγμένα στοιχεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6010,27 +6043,27 @@
 msgstr "Επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Επιλογή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6039,5 +6072,5 @@
 "αριστερή εργαλειοθήκη."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6315,13 +6348,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6433,4 +6466,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6449,6 +6486,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6466,8 +6501,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6478,4 +6520,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6490,33 +6538,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6540,12 +6577,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6617,10 +6664,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6650,8 +6701,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6714,6 +6761,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6766,4 +6811,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6828,32 +6885,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6862,6 +6927,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6870,24 +6937,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6902,82 +6959,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7058,155 +7115,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Όνομα"
@@ -7630,4 +7692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<διαφορετικά>"
@@ -8133,17 +8196,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8423,4 +8486,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8428,15 +8492,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Τύπος"
@@ -8455,16 +8519,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "άγνωστο"
@@ -9029,5 +9093,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9253,20 +9317,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Επίπεδο"
@@ -9713,5 +9777,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Όνομα: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Περιγραφή: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Μήκος: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} διαδρομή, "
+msgstr[1] "{0} διαδρομές, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} σημείο αναφοράς"
+msgstr[1] "{0} σημεία αναφοράς"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9719,62 +9841,17 @@
 msgstr "σημείο gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Όνομα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Περιγραφή: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Μήκος: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} διαδρομή, "
 msgstr[1] "{0} διαδρομές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} σημείο αναφοράς"
-msgstr[1] "{0} σημεία αναφοράς"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9784,10 +9861,10 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9798,7 +9875,7 @@
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9806,10 +9883,10 @@
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9817,10 +9894,10 @@
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9828,21 +9905,21 @@
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9854,10 +9931,10 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9865,5 +9942,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9871,30 +9948,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Χρηση καθολικών ρυθμίσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9902,5 +9979,5 @@
 msgstr "Προσαρμογή Χρώματος"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9909,5 +9986,5 @@
 msgstr "Προκαθορισμένο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9916,18 +9993,18 @@
 msgstr "Επιλέξτε ένα χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Σημάδια από Ονομασμένα Σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Εισαγωγή Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9937,23 +10014,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Αρχεία Κυματομορφής (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Σημάδια ήχου από {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Εισαγωγή εικόνων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10386,15 +10463,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Χωρίς εικόνα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Φόρτωση {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11336,4 +11413,48 @@
 msgid "Voice recorder calibration"
 msgstr "Βαθμονόμηση καταγραφέα ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Κατά την αποθήκευση, διατήρηση αντιγράφων ασφαλείας που τελειώνουν σε ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11417,5 +11538,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Αυτοκίνητο"
@@ -11434,16 +11555,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Ποδήλατο"
@@ -11477,12 +11598,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Πεζοί"
@@ -11731,18 +11852,18 @@
 msgstr "Προεπιλογή (οριζόμενο αυτόματα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12058,26 +12179,18 @@
 msgstr "Η προβολή {0} δεν μπορούσε να ενεργοποιηθεί. Χρησιμοποιώ το Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12193,6 +12306,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "εναλλακτικό"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12409,13 +12531,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Δημιουργία αντιγράφων ασφαλείας"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Κατά την αποθήκευση, διατήρηση αντιγράφων ασφαλείας που τελειώνουν σε ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12595,5 +12708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12602,49 +12715,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Άγνωστος τύπος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12654,15 +12767,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Σφάλμα ανάλυσης {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12672,17 +12785,17 @@
 msgstr[1] "Αλλαγή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Τίποτα επιλεγμένο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Εφαρμογή Προεπιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13290,5 +13403,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13386,5 +13499,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13393,5 +13506,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13460,5 +13573,5 @@
 msgstr "Το αρχείο \"{0}\" δεν υπάρχει"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13468,10 +13581,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13479,5 +13592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13485,5 +13598,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13491,10 +13604,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13502,5 +13615,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13508,5 +13621,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13514,5 +13627,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13521,10 +13634,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13532,9 +13645,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13542,11 +13655,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Άγνωστο αντικείμενο με id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13558,8 +13671,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13573,5 +13686,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13579,5 +13692,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13586,6 +13699,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13597,6 +13710,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13605,5 +13718,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13611,5 +13724,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13617,12 +13730,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13630,5 +13743,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13638,5 +13751,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13646,5 +13759,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13652,17 +13765,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14167,11 +14280,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14180,16 +14293,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14198,5 +14311,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14217,13 +14330,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Καμία ενέργεια"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Αναφορά σφάλματος"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14232,9 +14345,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Μη Αναμενόμενη Εξαίρεση"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14242,5 +14355,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14248,5 +14361,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14255,5 +14368,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14261,9 +14374,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14457,5 +14570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14508,5 +14621,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14520,5 +14633,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14528,5 +14641,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14537,5 +14650,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "Συμβουλή: Μπορείτε να αλλάξετε τις συντομεύσεις στις προτιμήσεις"
@@ -14636,5 +14749,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14720,10 +14833,61 @@
 msgstr "Αποστολή ιχνών στο openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Ώρες Λειτουργείας"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Αλλαγή ιδιοτήτων εώς {0} αντικειμένου"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Επιλέξτε"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Χάρτης: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Εργαλείο: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Ταχύτητα"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -14895,51 +15059,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Δεν μπορείτε να προσθέσετε κόμβο εκτός κόσμου."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15038,16 +15204,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15061,5 +15219,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15172,5 +15330,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Κτήρια"
@@ -15407,5 +15565,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15824,8 +15982,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15941,6 +16095,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Άδειο επίπεδο"
@@ -17313,5 +17467,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Μέσα Μαζικής Μεταφοράς"
@@ -17355,48 +17509,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Σημεία αναφοράς"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "φόρτωση δεδομένων από το API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "εισήχθησαν  δεδομένα από {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "αλλαγή της επιλογής"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Απομακρυσμένος έλεγχος"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Ρυθμίσεις για το πρόσθετο Απομακρυσμένου Ελέγχου."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17405,34 +17564,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Επιτρεπώμενες ενέργειες"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Θέλετε να το επιτρέψετε;"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17655,58 +17814,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Φόρτωση πλακιδίου"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Φόρτωση όλων των πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Άυξηση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Μείωση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "αυτόματο ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "αυτόματη φόρτωση πλακιδίων"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ρυθμίσεις για το πρόσθετο SlippyMap."
@@ -17990,11 +18149,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Επεξεργασία Αγωγού"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19075,5 +19233,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19193,59 +19351,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19726,142 +19884,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "επάνω"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19881,7 +20037,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "Υπολογιστές"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19975,12 +20130,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Επιλογή με την δοθείσα αναζήτηση"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Σημεία αναφοράς"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -19997,9 +20150,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Δημιοθργήθηκε εξαίρεση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20058,21 +20211,21 @@
 msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20083,5 +20236,5 @@
 msgstr "Λήψη πλακιδίου WMS από {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20090,5 +20243,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20096,10 +20249,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20108,24 +20261,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20136,17 +20289,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20154,58 +20307,82 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Αυτόματη λήψη"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο"
@@ -20768,16 +20945,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Εισάγει προβλήματα από OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20785,5 +20967,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20791,5 +20973,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20798,5 +20980,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20805,10 +20987,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20816,15 +20998,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20834,5 +21016,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20841,10 +21023,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Παρέχει δυνατότητες δρομολόγησης."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20853,5 +21035,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20860,15 +21042,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20878,15 +21060,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20895,5 +21077,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20902,5 +21084,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20909,10 +21091,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20921,5 +21103,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20929,5 +21111,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20939,20 +21121,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20961,5 +21143,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21001,4 +21183,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21031,10 +21214,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Οδοί"
@@ -21045,5 +21228,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Αυτοκινητόδρομος"
@@ -21052,5 +21235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Επεξεργασία Αυτοκινητοδρόμου"
@@ -21087,10 +21270,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr ""
@@ -21104,8 +21287,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Λωρίδες κυκλοφορίας"
@@ -21124,13 +21307,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Μεγ. Ταχύτητα (χαω)"
@@ -21164,17 +21347,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Μονόδρομος"
@@ -21211,17 +21394,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21255,17 +21438,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Σήραγγα"
@@ -21296,17 +21479,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr ""
@@ -21337,17 +21520,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr ""
@@ -21355,5 +21538,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr ""
@@ -21362,5 +21545,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr ""
@@ -21368,5 +21551,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr ""
@@ -21375,5 +21558,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr ""
@@ -21383,6 +21566,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Αυτοκινητόδρομος"
@@ -21390,5 +21573,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr ""
@@ -21397,5 +21580,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr ""
@@ -21408,5 +21591,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Πρωτεύων"
@@ -21415,5 +21598,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Επεξεργασία Πρωτεύοντος Δρόμου"
@@ -21421,10 +21604,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr ""
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -21436,5 +21619,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Δευτερεύων"
@@ -21444,5 +21627,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Επεξεργασία Δευτερεύοντος Δρόμου"
@@ -21450,5 +21633,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Τριτεύων"
@@ -21458,5 +21641,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Επεξεργασία Τριτεύοντος Δρόμου"
@@ -21468,5 +21651,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Μη κατηγοριοποιημένος"
@@ -21476,5 +21659,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -21484,6 +21667,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21506,15 +21689,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
@@ -21526,5 +21709,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Οικιστική"
@@ -21533,5 +21716,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Επεξεργασία οικιστικής οδού"
@@ -21551,12 +21734,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Επιφάνεια"
@@ -21578,166 +21761,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "άλσος"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "χαλίκι"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "χόρτο"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "άμμος"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21745,5 +21928,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -21752,5 +21935,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -21758,5 +21941,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Πεζόδρομος"
@@ -21765,5 +21948,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Επεξεργασία Πεοζόδρομου"
@@ -21771,5 +21954,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr ""
@@ -21778,5 +21961,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr ""
@@ -21786,18 +21969,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21805,5 +21988,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -21813,10 +21996,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Δρόμος (Άγνωστος Τύπος)"
@@ -21825,5 +22008,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Επεξεργασία Δρόμου Άγνωστου Τύπου"
@@ -21831,14 +22014,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Υπό κατασκευή"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Επεξεργασία οδού ταχείας κυκλοφορίας υπό κατασκευή"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Κόμβος"
@@ -21854,5 +22037,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -21861,5 +22044,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Περιορισμοί Δρόμου"
@@ -21868,15 +22051,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Επεξεργασία Περιορισμών Δρόμου"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Διόδια"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Αδιέξοδο"
@@ -21884,5 +22067,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Πρόσβαση"
@@ -21908,4 +22091,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21913,4 +22097,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21986,236 +22176,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "ιδιωτικό"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "αγροτικό"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "όχι"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "ναι"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "ιδιωτικό"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "προορισμός"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "αγροτικό"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "όχι"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22230,10 +22427,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Άλογο"
@@ -22249,10 +22446,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Μοτοσυκλέτα"
@@ -22267,19 +22465,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Αυτοκίνητο"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -22287,20 +22485,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Μεγ. βάρος (τόνοι)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Μέγιστο Ύψος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Μέγιστο Πλάτος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Μέγιστο Μήκος (μέτρα)"
@@ -22308,5 +22506,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Κυκλικός κόμβος"
@@ -22317,5 +22515,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr ""
@@ -22335,10 +22533,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -22360,10 +22558,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22385,10 +22583,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "πρωτεύων"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22410,5 +22608,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22423,9 +22621,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "τριτεύων"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "αταξινόμητος"
@@ -22439,9 +22637,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "Οικιστική"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr ""
@@ -22485,10 +22683,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22518,5 +22716,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22528,10 +22726,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Επεξεργασία Γέφυρας"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Σήραγγα"
@@ -22539,10 +22737,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22551,35 +22749,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22587,5 +22785,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Μονοπάτι"
@@ -22594,76 +22792,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Επεξεργασία μονοπατιού"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Σκι"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -22672,5 +22870,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22678,5 +22876,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -22684,5 +22882,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22700,11 +22898,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Επεξεργασία ποδηλατόδρομου"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22712,5 +22910,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22718,5 +22916,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22724,5 +22922,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22731,5 +22929,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr ""
@@ -22737,5 +22935,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Σκαλοπάτια"
@@ -22745,10 +22943,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Επεξεργασία σκαλοπατιών"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Σύνολο Καθισμάτων"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Κόμβος Αυτοκινητοδρόμου"
@@ -22756,15 +22960,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Επεξεργασία Κόμβου Αυτοκινητοδρόμου"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Αριθμός"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Υπηρεσίες"
@@ -22772,5 +22976,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -22778,10 +22982,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22810,36 +23015,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Λειτουργός"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "υδατόρρευμα"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Επεξεργασία Εστιατορίου"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Τηλέφωνο εκτάκτου ανάγκης"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Σηματοδότης"
@@ -22849,5 +23075,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Τύπος διάβασης πεζών"
@@ -22856,27 +23082,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "σηματοδότες"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "νησίδα"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22884,6 +23110,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22892,11 +23118,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22904,30 +23130,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -22935,67 +23161,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Διάβαση Πεζών"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Επεξεργασία Διάβασης Πεζών"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Μικρός Κυκλικός Κόμβος"
@@ -23006,14 +23170,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "δεξιόστροφα"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Διάβαση Πεζών"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Επεξεργασία Διάβασης Πεζών"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr ""
@@ -23023,5 +23249,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Όρια πόλης"
@@ -23029,15 +23255,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Επεξεργασία πινακίδας ορίων πόλης"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Δεύτερο Όνομα"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Κάμερα ελέγχου ταχύτητας"
@@ -23046,11 +23272,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Τηλέφωνο εκτάκτου ανάγκης"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -23058,5 +23279,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -23064,5 +23285,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23072,10 +23293,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr ""
@@ -23083,5 +23304,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Ορεινό πέρασμα"
@@ -23089,5 +23310,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Επεξεργασία ορεινού Περάσματος"
@@ -23096,10 +23317,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -23107,5 +23328,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Εμπόδια"
@@ -23113,5 +23334,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23119,5 +23340,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23162,16 +23383,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Επιτρεπόμενα οχήματα:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23180,5 +23401,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23186,5 +23407,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23192,10 +23413,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23203,15 +23424,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Σταθμός Διοδίων"
@@ -23219,5 +23440,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Επεξεργασία Σταθμού Διοδίων"
@@ -23225,10 +23446,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Συνοριακός Σταθμός"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Επεξεργασία Συνοριακού Σταθμού"
@@ -23237,5 +23458,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Φράκτης θάμνων"
@@ -23246,22 +23467,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Φράκτης"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Τοίχος"
@@ -23269,5 +23490,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr ""
@@ -23276,5 +23497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23285,10 +23506,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Είσοδος"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Επεξεργασία Εισόδου"
@@ -23296,5 +23517,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Πύλη"
@@ -23302,50 +23523,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Επεξεργασία Πύλης"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23353,25 +23574,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23379,25 +23600,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Νερό"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Πηγή"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Επεξεργασία πηγής"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Αποχέτευση"
@@ -23405,10 +23615,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Επεξεργασία Αποχέτευσης"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Χαντάκι"
@@ -23416,10 +23626,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Επεξεργασία Χαντακιού"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Υδατόρρευμα"
@@ -23427,10 +23637,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Επεξεργασία Υδατορρεύματος"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Κανάλι"
@@ -23438,10 +23648,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Επεξεργασία Καναλιού"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Ποταμός"
@@ -23451,59 +23661,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Επεξεργασία ποταμού"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Πηγή"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Επεξεργασία πηγής"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Καταρράκτης"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Επεξεργασία Καταράκτη"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Φράγμα εκτροπής"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Επεξεργασία φράγματος εκτροπής"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Φράγμα"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Επεξεργασία Φweirράγματος"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Λεκάνη"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Ταμιευτήρας"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Επεξεργασία Ταμιευτήρα"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Καλυμένος Ταμιευτήρας"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Ξηρά"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Λεκάνη"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Ταμιευτήρας"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Επεξεργασία Ταμιευτήρα"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Καλυμένος Ταμιευτήρας"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Ακτογραμμή"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Επεξεργασία Ακτογραμμής"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Όχθη ποταμού"
@@ -23512,10 +23776,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Επεξεργασία όχθης ποταμού"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr ""
@@ -23526,14 +23791,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Βάλτος"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -23547,35 +23812,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "έλος"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Λάσπη"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Επεξεργασία λασπότοπου"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Παραλία"
@@ -23583,20 +23848,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Επεξεργασία παραλίας"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Όρμος"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Επεξεργασία όρμου"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Λόφος"
@@ -23604,145 +23869,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Επεξεργασία λόφου"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Ακτογραμμή"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Επεξεργασία Ακτογραμμής"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Αγορές"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Αυτοκίνητο"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "αρχαρίων"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "ποδήλατο"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr ""
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr ""
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr ""
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Φράγμα"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Επεξεργασία Φweirράγματος"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Σημείο Υδατοδιαδρομής"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr ""
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Αποβάθρα"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Επεξεργασία Αποβάθρας"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr ""
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Φράγμα εκτροπής"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Επεξεργασία φράγματος εκτροπής"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Καταρράκτης"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Επεξεργασία Καταράκτη"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Αποβάθρα"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Επεξεργασία Αποβάθρας"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23752,16 +24088,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr ""
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Μεταφορές"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Σιδηρόδρομος"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Σιδηροτροχιά"
@@ -23769,5 +24127,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Επεξεργασία σιδηροτροχιάς"
@@ -23797,7 +24155,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23813,8 +24171,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23828,29 +24186,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23863,8 +24221,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23935,8 +24293,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23948,8 +24306,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
@@ -23962,8 +24320,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23976,23 +24334,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr ""
@@ -24000,50 +24358,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Υπόγειος Σιδηρόδρομος"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Τραμ"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Επεξεργασία Τραμ"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -24051,5 +24409,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -24058,10 +24416,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr ""
@@ -24070,9 +24428,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr ""
@@ -24081,5 +24439,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Ισόπεδη διάβαση"
@@ -24088,5 +24446,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Φυλασόμενη Διάβαση"
@@ -24096,5 +24454,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Είδος Διάβασης"
@@ -24102,5 +24460,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Περιστρεφόμενη πλατφόρμα"
@@ -24109,5 +24467,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24116,10 +24474,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr ""
@@ -24127,10 +24485,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24138,10 +24496,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr ""
@@ -24149,10 +24507,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24160,10 +24518,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24172,5 +24531,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24178,5 +24537,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24185,5 +24544,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24191,5 +24550,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Καύσιμα"
@@ -24199,69 +24558,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Επεξεργασία καυσίμων"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "γη"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24278,34 +24659,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24313,37 +24695,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24364,33 +24757,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24399,170 +24794,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "κατάστημα"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Σε σύνδεση"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Περίπτερο"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24570,4 +24987,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24579,6 +24997,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Χώρος στάθμευσης"
@@ -24587,5 +25005,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Επεξεργασία Χώρου Στάθμευσης"
@@ -24596,25 +25014,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "πολυόροφο"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "επιφάνεια"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "υπόγειο"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24623,54 +25043,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Κόστος"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Θέσεις αναπήρων"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Πλυντήριο"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Επεξεργασία πλυντηρίου"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Επεξεργασία Καταστήματος"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Συνεργείο Αυτοκινήτων"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "ναι"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Επεξεργασία δένδρου"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Επικοινωνήστε με {0}"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Αριθμός Τηλεφώνου"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Ενοικίαση"
@@ -24679,10 +25243,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Επεξεργασία Ενοικίασης"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -24690,28 +25253,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Χωρητικότητα"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Μοτοσυκλέτα"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Επεξεργασία Αυτοκινητοδρόμου"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Υπηρεσίες"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Αποθήκευση"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "γη"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Προεπιλογές"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Ρούχα"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Χωρητικότητα"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24721,5 +25343,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24727,5 +25349,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24733,5 +25355,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -24739,5 +25361,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -24745,5 +25367,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Στάση Τραμ"
@@ -24752,5 +25374,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Επεξεργασία Στάσης Τραμ"
@@ -24758,5 +25380,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr ""
@@ -24765,5 +25387,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr ""
@@ -24775,5 +25397,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24781,10 +25403,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Είσοδος υπογείου σιδηρόδρομου"
@@ -24793,10 +25415,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -24805,5 +25427,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Σταθμός Λεωφορείων"
@@ -24812,5 +25434,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Επεξεργασία Σταθμού Λεωφορείων"
@@ -24818,5 +25440,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Στάση Λεωφορείου"
@@ -24826,13 +25448,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Επεξεργασία Στάσης Λεωφορείου"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -24840,19 +25461,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Παγκάκι"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -24860,5 +25481,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Ταξί"
@@ -24866,5 +25487,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Επεξεργασία σταθμού ταξί"
@@ -24872,10 +25493,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Αεροδρόμιο"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24883,5 +25504,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24889,10 +25510,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -24901,5 +25522,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24907,5 +25528,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24913,5 +25534,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24919,5 +25540,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24925,5 +25546,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24931,5 +25552,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24939,5 +25560,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24947,5 +25568,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24956,6 +25577,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Φάρος"
@@ -24965,5 +25586,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24972,5 +25593,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24978,5 +25599,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24984,15 +25605,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Ταξίδι"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -25004,5 +25625,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Ξενοδοχείο"
@@ -25011,5 +25632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Επεξεργασία Ξενοδοχείου"
@@ -25022,8 +25643,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Αστέρια"
@@ -25047,34 +25668,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25088,168 +25709,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Αριθμός Τηλεφώνου"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr ""
@@ -25257,20 +25783,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -25278,10 +25804,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr ""
@@ -25289,30 +25815,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -25320,10 +25847,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -25334,5 +25861,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -25340,5 +25867,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
@@ -25346,5 +25873,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -25352,79 +25881,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25432,18 +25961,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25451,10 +25980,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Καφέ"
@@ -25462,10 +25991,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25473,20 +26007,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Μπυραρία"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Επεξεργασία Μπυραρίας"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Μπαρ"
@@ -25494,10 +26028,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -25505,25 +26039,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Μουσείο"
@@ -25531,9 +26065,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -25542,9 +26076,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Θεματικό Πάρκο"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Επεξεργασία Θεματικού Πάρκου"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr ""
@@ -25552,50 +26107,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Θεματικό Πάρκο"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Επεξεργασία Θεματικού Πάρκου"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr ""
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Τζάκι"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25633,5 +26189,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25639,28 +26195,28 @@
 msgstr "οδός"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25670,5 +26226,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25676,5 +26232,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -25682,6 +26238,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -25689,5 +26245,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25695,6 +26251,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr ""
@@ -25702,5 +26258,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25708,46 +26264,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25756,5 +26312,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25762,55 +26318,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr ""
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Τζάκι"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Κάστρο"
@@ -25819,19 +26354,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -25840,9 +26375,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -25850,10 +26385,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25861,5 +26396,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25867,15 +26402,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -25883,55 +26418,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -25939,35 +26474,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -25981,6 +26516,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -26396,6 +26931,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26430,240 +26965,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26680,5 +27215,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26705,23 +27239,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "τύπος"
@@ -26738,5 +27280,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26763,211 +27304,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Μηχανοκίνητα Αθλήματα"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -26975,52 +27519,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -27028,204 +27572,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Μηχανοκίνητα Αθλήματα"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Προειδοποίηση"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Επεξεργασία Χώρου Στάθμευσης"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Αυτοκίνητο"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Επεξεργασία Συνοριακού Σταθμού"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Αυτοκίνητο"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Επεξεργασία Μπαρ"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Κτήριο"
@@ -27233,5 +27843,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -27239,10 +27849,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -27250,10 +27860,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -27261,10 +27871,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -27273,10 +27883,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Φυλακή"
@@ -27285,10 +27895,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Αστυνομία"
@@ -27298,10 +27908,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -27310,10 +27920,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -27321,5 +27931,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -27327,15 +27937,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Νηπιαγωγείο"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγείου"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Σχολείο"
@@ -27343,10 +27953,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -27354,10 +27964,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Κολέγιο"
@@ -27365,5 +27975,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -27371,5 +27981,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -27378,10 +27988,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -27390,9 +28000,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -27400,10 +28010,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -27412,10 +28022,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -27425,5 +28035,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -27432,6 +28042,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -27440,66 +28050,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -27508,189 +28118,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Διευθύνσεις"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Επεξεργασία διεύθυνσης"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Αριθμός σπιτιού"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Όνομα Σπιτιού"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Όνομα οδού"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Όνομα πόλης"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Ταχυδρομικός Κώδικας"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Κωδικός χώρας"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Τρόπος Αρίθμησης"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "Μονά"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "Ζυγά"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27698,25 +28238,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -27724,10 +28264,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -27735,10 +28275,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -27747,41 +28287,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "Αέριο"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Θέση"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -27791,10 +28331,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Γερανός"
@@ -27802,5 +28342,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
@@ -27808,10 +28348,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr ""
@@ -27819,10 +28359,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -27830,23 +28370,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -27856,35 +28396,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -27893,10 +28433,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -27905,5 +28445,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -27911,10 +28451,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -27925,23 +28465,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -27950,20 +28490,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27971,55 +28511,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "μονή"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "διπλή"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "τριπλή"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "τετραπλή"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -28028,5 +28568,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -28034,5 +28574,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Κέρματα"
@@ -28040,5 +28580,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -28046,5 +28586,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -28052,5 +28592,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -28058,15 +28598,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -28075,5 +28615,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -28081,35 +28621,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Ρούχα"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28117,5 +28652,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28124,31 +28659,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Υλικό"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "πέτρα"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "πλαστικό"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Χρώμα"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "μαύρο"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "καφέ"
@@ -28227,5 +28762,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28235,31 +28770,31 @@
 msgstr "πράσινο"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "κόκκινο"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "μπλε"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "γκρι"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "λευκό"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Σύνολο Καθισμάτων"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28267,31 +28802,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -28300,10 +28835,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -28312,10 +28847,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28324,5 +28859,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28330,501 +28865,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Πεζοί"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Επεξεργασία Supermarket"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Περίπτερο"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Επεξεργασία Περιπτέρου"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Κρεοπωλείο"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Επεξεργασία Κρεοπωλείου"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Φούρνος"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Επεξεργασία Φούρνου"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Βιολογικά"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Επεξεργασία Καταστήματος Βιολογικών"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Κάβα Ποτών"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Επεξεργασία Κάβας Ποτών"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Ποτά"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Καταστήματα"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Κομμωτήριο"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Επεξεργασία Κομμωτηρίου"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Οπτικός"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Επεξεργασία Οπτικού"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Υποδήματα"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Επεξεργασία Υποδηματοπωλείου"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Επεξεργασία Καταστήματος Αθλητικών"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Στεγνοκαθαριστήριο"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Πλυντήριο"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Επεξεργασία πλυντηρίου"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Σιδηροτροχιά"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Επεξεργασία σιδηροτροχιάς"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Υπολογιστές"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Ηλεκτρονικά"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Ηχοσυστήματα"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Ανθοπωλείο"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Επεξεργασία Ανθοπωλείου"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Είδη Κήπου"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Σιδηρικά"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Έπιπλα"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Επεξεργασία Καταστήματος Επίπλων"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Χαρτικά"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Επεξεργασία Χαρτοπωλείου"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Ταξιδιωτικό Γραφείο"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Παιχνίδια"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Μηχάνημα Πώλησης"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Επεξεργασία Μηχανήματος Πώλησης"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Πωλούμενα Προϊόντα"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "εισιτήρια Στάθμευσης"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "φαγητό"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "ποτά"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "γλυκά"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "τσιγάρα"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "φωτογραφίες"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "τροφές ζώων"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "εφημερίδες"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "Παιχνίδια"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "Γραμματόσημα"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "Κάρτες SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "κουπόνια"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "Προφυλακτικά"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampons"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Μετρητά"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Τράπεζα"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Επεξεργασία Τράπεζας"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "ΑΤΜ"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Συναλλακτήριο"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Επεξεργασία Συναλλακτηρίου"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Επεξεργασία ΑΤΜ"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Υγεία"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Ιατροί"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Επεξεργασία Ιατρών"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Οδοντίατρος"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Επεξεργασία Οδοντιάτρου"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Φαρμακείο"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Επεξεργασία Φαρμακείου"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr ""
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Νοσοκομείο"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Επεξεργασία Νοσοκομειου"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Καταστήματα"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Επεξεργασία Καταστήματος"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Επεξεργασία Supermarket"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr ""
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr ""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Περίπτερο"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Επεξεργασία Περιπτέρου"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Ταξιδιωτικό Γραφείο"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Κρεοπωλείο"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Επεξεργασία Κρεοπωλείου"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Φούρνος"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Επεξεργασία Φούρνου"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Ανθοπωλείο"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Επεξεργασία Ανθοπωλείου"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Βιολογικά"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Επεξεργασία Καταστήματος Βιολογικών"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Κάβα Ποτών"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Επεξεργασία Κάβας Ποτών"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Ποτά"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Υπολογιστές"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Ηλεκτρονικά"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Ηχοσυστήματα"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Έπιπλα"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Επεξεργασία Καταστήματος Επίπλων"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Είδη Κήπου"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Σιδηρικά"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Χαρτικά"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Επεξεργασία Χαρτοπωλείου"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Κομμωτήριο"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Επεξεργασία Κομμωτηρίου"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Υποδήματα"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Επεξεργασία Υποδηματοπωλείου"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Παιχνίδια"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Στεγνοκαθαριστήριο"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Πλυντήριο"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Επεξεργασία πλυντηρίου"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Επεξεργασία Καταστήματος Αθλητικών"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Οπτικός"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Επεξεργασία Οπτικού"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Μηχάνημα Πώλησης"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Επεξεργασία Μηχανήματος Πώλησης"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Πωλούμενα Προϊόντα"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "εισιτήρια Στάθμευσης"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "φαγητό"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "ποτά"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "γλυκά"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "τσιγάρα"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "φωτογραφίες"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "τροφές ζώων"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "εφημερίδες"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "Παιχνίδια"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "Γραμματόσημα"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "Κάρτες SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "κουπόνια"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "Προφυλακτικά"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampons"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Μετρητά"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Τράπεζα"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Επεξεργασία Τράπεζας"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "ΑΤΜ"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Συναλλακτήριο"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Επεξεργασία Συναλλακτηρίου"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Επεξεργασία ΑΤΜ"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Υγεία"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Ιατροί"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Επεξεργασία Ιατρών"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Οδοντίατρος"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Επεξεργασία Οδοντιάτρου"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Φαρμακείο"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Επεξεργασία Φαρμακείου"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr ""
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Νοσοκομείο"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Επεξεργασία Νοσοκομειου"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -28833,5 +29370,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28840,15 +29377,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -28856,5 +29393,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -28863,368 +29400,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Γεωγραφία"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Όρια"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Εθνικό"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Επεξεργασία Εθνικού Συνόρου"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Διοικητικό"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Επεξεργασία Διοικητικού Ορίου"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Αστικό"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Επεξεργασία Αστικού Ορίου"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Πολιτικό"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Επεξεργασία Πολιτικού Ορίου"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Εθνικό πάρκο"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Τοποθεσίες"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Ήπειρος"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Χώρα"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Πολιτεία"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Περιοχή"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Περιφέρεια"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Πόλη"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Κωμόπολη"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Προάστιο"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Χωριό"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Οικισμός"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Επεξεργασία Οικισμού"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Τοπονύμιο/Περιοχή"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Επεξεργασία Τοπονυμίου/Περιοχής"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Κορυφή"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Επεξεργασία κορυφής"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Παγετώνας"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Επεξεργασία παγετώνα"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Ηφαίστειο"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Επεξεργασία ηφαιστείου"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Είσοδος σπηλαίου"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Επεξεργασία εισόδου σπηλαίου"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Νησί"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Νησίδα"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Επεξεργασία Νησίδας"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Χωρίς ημερομηνία"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Δένδρο"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Επεξεργασία δένδρου"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Βοτανικό όνομα"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Άλσος"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Επεξεργασία άλσους"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "Κωνοφόρο"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "φυλλοβόλα"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "Μικτό"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Δάσος"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Επεξεργασία Δάσους"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Εθνικός Δρυμός"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Επεξεργασία Εθνικού Δρυμού"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Είσοδος σπηλαίου"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Επεξεργασία εισόδου σπηλαίου"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Κορυφή"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Επεξεργασία κορυφής"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Παγετώνας"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Επεξεργασία παγετώνα"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Ηφαίστειο"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Επεξεργασία ηφαιστείου"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Όρια"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Εθνικό"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Επεξεργασία Εθνικού Συνόρου"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Διοικητικό"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Επεξεργασία Διοικητικού Ορίου"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Αστικό"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Επεξεργασία Αστικού Ορίου"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Πολιτικό"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Επεξεργασία Πολιτικού Ορίου"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Εθνικό πάρκο"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr ""
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr ""
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr ""
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Δένδρο"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Επεξεργασία δένδρου"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Βοτανικό όνομα"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Άλσος"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Επεξεργασία άλσους"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "Κωνοφόρο"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "φυλλοβόλα"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "Μικτό"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Δάσος"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Επεξεργασία Δάσους"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Εθνικός Δρυμός"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Επεξεργασία Εθνικού Δρυμού"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr ""
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr ""
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr ""
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr ""
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr ""
@@ -29233,45 +29776,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Λειβάδι"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Επεξεργασία Λειβαδιού"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29279,25 +29822,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29305,10 +29848,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29316,20 +29859,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -29337,5 +29880,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -29343,15 +29886,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -29359,9 +29902,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -29369,39 +29912,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -29409,15 +29952,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29425,52 +29968,183 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Πληροφορίες"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Διευθύνσεις"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Επεξεργασία διεύθυνσης"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Αριθμός σπιτιού"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Όνομα Σπιτιού"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Όνομα οδού"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Όνομα πόλης"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Ταχυδρομικός Κώδικας"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Κωδικός χώρας"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "Α"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "Ν"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Τρόπος Αρίθμησης"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "Μονά"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "Ζυγά"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Διένεξη"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Προσθήκη πληροφοριών συγγραφέα"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Εικόνα"
 
 #. item "Relations/Multipolygon"
@@ -29478,5 +30152,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29488,5 +30162,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "εξωτερικός τομέας"
@@ -29494,5 +30168,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "εσωτερικός τομέας"
@@ -29500,5 +30174,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29509,5 +30183,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29515,36 +30189,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29552,5 +30226,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -29559,5 +30233,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -29565,34 +30239,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -29601,15 +30275,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr ""
@@ -29617,5 +30291,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Διαδρομή"
@@ -29624,5 +30298,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -29630,132 +30304,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "ποδήλατο"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "Πορθμείο"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "σκι"
@@ -29823,5 +30386,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29831,9 +30394,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "παράκαμψη"
@@ -29847,10 +30410,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -29858,31 +30421,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -29891,30 +30454,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -33892,7 +34455,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34014,8 +34576,14 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Δημιουργία αντιγράφων ασφαλείας"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Σημείο Υδατοδιαδρομής"
 
 #~ msgid ""
@@ -34199,7 +34767,4 @@
 #~ msgstr[0] "εικόνα"
 #~ msgstr[1] "εικόνες"
-
-#~ msgid "Image"
-#~ msgstr "Εικόνα"
 
 #~ msgid ""
@@ -34559,7 +35124,4 @@
 #~ msgstr "Σφάλματα κατά την λήψη"
 
-#~ msgid "Contact {0}..."
-#~ msgstr "Επικοινωνήστε με {0}"
-
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Αδυναμία ανάγνωσης από το URL: \"{0}\""
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 22859)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-06-15 17:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Warning"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -238,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -277,5 +277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -300,5 +300,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -409,4 +409,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -424,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1048,5 +1049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1066,5 +1067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1465,13 +1466,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1480,5 +1481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1486,9 +1487,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1496,5 +1497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1528,8 +1529,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1538,9 +1539,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1556,6 +1557,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1565,5 +1566,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1588,6 +1589,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Error"
@@ -1749,5 +1750,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "No, abort"
@@ -2034,5 +2035,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2508,5 +2509,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2550,9 +2551,9 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2560,9 +2561,9 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2841,5 +2842,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Search"
@@ -3038,7 +3039,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3308,5 +3309,5 @@
 msgstr[1] "Move {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3464,31 +3465,31 @@
 msgstr "Automatic tag correction"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3507,15 +3508,15 @@
 msgstr "Illegal longitude value ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Warning: failed to persist preferences to ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Malformed config file at lines {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3526,5 +3527,5 @@
 "not a directory."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3535,5 +3536,5 @@
 "not a directory.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3544,5 +3545,5 @@
 "preference directory: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3553,5 +3554,5 @@
 "preference directory: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3560,5 +3561,5 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3569,5 +3570,5 @@
 "file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3578,5 +3579,5 @@
 "to default: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3587,5 +3588,5 @@
 "<br> and creating a new default preference file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3596,10 +3597,10 @@
 "default: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3726,5 +3727,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3801,9 +3802,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3813,5 +3814,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4006,15 +4007,34 @@
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zone"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "North"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "south"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Jump there"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4038,9 +4058,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4084,5 +4104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "railway"
@@ -4103,5 +4123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4356,69 +4376,69 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4432,9 +4452,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4444,57 +4464,66 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debit cards"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Preference setting {0} has been removed since it is no longer used."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4504,9 +4533,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4520,9 +4549,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4646,23 +4676,23 @@
 msgstr "User:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4760,5 +4790,5 @@
 msgstr "Click to close the dialogue and to abort deleting the objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4768,17 +4798,17 @@
 "level.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Zoom level:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "from tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "up to tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4792,25 +4822,25 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Tile address:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Apply the tile address"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Please enter a tile address"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "The current value isn''t a valid tile address"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Please enter a tile index"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "The current value isn''t a valid tile index for the given zoom level"
@@ -5228,4 +5258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5308,4 +5339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5322,4 +5354,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5393,5 +5426,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5403,10 +5436,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "none"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "all"
@@ -5488,5 +5521,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5498,5 +5531,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5531,17 +5564,17 @@
 msgstr "Not decided yet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Enter a role for all relation memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Tag modified relations with "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5551,15 +5584,15 @@
 "modified relations.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Key:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5567,5 +5600,5 @@
 msgstr "Value:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5573,5 +5606,5 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5589,5 +5622,5 @@
 "place of the original way in the relation.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5605,5 +5638,5 @@
 "the place of the original node in the relation.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Apply this role to all members"
@@ -5749,5 +5782,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5866,5 +5899,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5872,5 +5905,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5878,5 +5911,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5884,5 +5917,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5890,5 +5923,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5897,5 +5930,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5903,5 +5936,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5909,5 +5942,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5915,24 +5948,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5953,5 +5986,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5976,37 +6009,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Enter the coordinates for the new node."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Use decimal degrees."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative values denote Western/Southern hemisphere."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Please enter a valid latitude in the range -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Please enter a latitude in the range -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Please enter a valid longitude in the range -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Please enter a longitude in the range -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Close the dialogue and create a new node"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Close the dialogue, do not create a new node"
@@ -6062,9 +6095,9 @@
 msgstr "Information about layer"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relations"
@@ -6112,10 +6145,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6135,37 +6168,37 @@
 msgstr "Open a selection list window."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zoom to selected element(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6174,27 +6207,27 @@
 msgstr "Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6202,5 +6235,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -6487,13 +6520,13 @@
 msgstr "Nothing to zoom to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "The content of this changeset is not downloaded yet."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Download now"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Download the changeset content"
@@ -6605,4 +6638,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6621,6 +6658,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6638,8 +6673,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6650,4 +6692,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6662,33 +6710,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6712,12 +6749,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6789,10 +6836,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6822,8 +6873,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6886,6 +6933,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6938,4 +6983,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7000,32 +7057,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7034,6 +7099,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7042,24 +7109,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7074,82 +7131,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7230,155 +7287,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Name"
@@ -7835,4 +7897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<different>"
@@ -8365,17 +8428,17 @@
 msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "including immediate children of parent relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Load parent relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Loading parent relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Edit the currently selected relation"
@@ -8660,4 +8723,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8665,15 +8729,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Type"
@@ -8692,16 +8756,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "unknown"
@@ -9322,5 +9386,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Launch a file chooser to select a file"
@@ -9565,20 +9629,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Layer"
@@ -10062,5 +10126,63 @@
 msgstr[1] "{0} objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Description: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} track"
+msgstr[1] "{0} tracks"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Timespan"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Length"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Length: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10068,62 +10190,17 @@
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Description: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} track"
 msgstr[1] "{0} tracks"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Description"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Timespan"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Length"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Length: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} route, "
-msgstr[1] "{0} routes, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10133,10 +10210,10 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10147,7 +10224,7 @@
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10155,10 +10232,10 @@
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10166,10 +10243,10 @@
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10177,21 +10254,21 @@
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10203,9 +10280,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10215,5 +10292,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10223,30 +10300,30 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10254,5 +10331,5 @@
 msgstr "Customise Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10261,5 +10338,5 @@
 msgstr "Default"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10268,18 +10345,18 @@
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10292,23 +10369,23 @@
 "them with audio data.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import not possible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10762,15 +10839,15 @@
 msgstr "Image file could not be deleted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "No image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Loading {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11804,4 +11881,48 @@
 msgid "Voice recorder calibration"
 msgstr "Voice recorder calibration"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Update interval (in days):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Default value is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "When saving, keep backup files ending with a ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "File backup"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Configure whether to create backup files"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11885,5 +12006,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Car"
@@ -11902,16 +12023,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicycle"
@@ -11945,12 +12066,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Foot"
@@ -12209,18 +12330,18 @@
 msgstr "Default (Auto determined)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Enable built-in defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Enable built-in icon defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Used style"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
@@ -12567,27 +12688,19 @@
 msgstr "The projection {0} could not be activated. Using Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Proxy settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "File backup"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "Configure your identity and how to authenticate at the OSM server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Configure whether to use a proxy server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Configure whether to create backup files"
 
 #. 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
@@ -12704,6 +12817,15 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternate"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12941,12 +13063,4 @@
 "authentication method ''Basic Authentication''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Keep backup files"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "When saving, keep backup files ending with a ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13139,5 +13253,5 @@
 msgstr "Add a new tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13148,49 +13262,49 @@
 "be the same as in values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13200,15 +13314,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13218,17 +13332,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13866,5 +13980,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13974,5 +14088,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13981,5 +14095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14050,5 +14164,5 @@
 msgstr "File \"{0}\" does not exist"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14060,10 +14174,10 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Found XML element <nd> not as direct child of element <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14071,5 +14185,5 @@
 msgstr "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14077,5 +14191,5 @@
 msgstr "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14083,10 +14197,10 @@
 msgstr "Deleted way {0} contains nodes"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr "Found XML element <member> not as direct child of element <relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14094,5 +14208,5 @@
 msgstr "Missing attribute ''ref'' on member in relation {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14100,5 +14214,5 @@
 msgstr "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14106,5 +14220,5 @@
 msgstr "Missing attribute ''type'' on member {0} in relation {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14114,10 +14228,10 @@
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member> specification with ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14125,9 +14239,9 @@
 msgstr "Deleted relation {0} contains members"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14135,11 +14249,11 @@
 msgstr "Undefined element ''{0}'' found in input stream. Skipping."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Illegal object with id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14153,8 +14267,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14170,5 +14284,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14176,5 +14290,5 @@
 msgstr "Unknown or unsupported API version. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14183,6 +14297,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14196,6 +14310,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14204,5 +14318,5 @@
 msgstr "Illegal value for attribute ''changeset''. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14210,5 +14324,5 @@
 msgstr "Missing required attribute ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14216,13 +14330,13 @@
 msgstr "Illegal long value for attribute ''{0}''. Got ''{1}''."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14230,5 +14344,5 @@
 msgstr "Deleted node {0} is part of way {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14240,5 +14354,5 @@
 "missing in the loaded data."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14250,5 +14364,5 @@
 "external id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14256,17 +14370,17 @@
 msgstr "Deleted member {0} is used by relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Parsing OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Preparing data set..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14805,11 +14919,11 @@
 msgstr "Download plug-in list..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Downloading plug-in list from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14820,16 +14934,16 @@
 "list from plug-in site ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Writing plug-in list to local cache ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Parsing plug-in list from site ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14840,5 +14954,5 @@
 "Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14859,13 +14973,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Report Bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14877,9 +14991,9 @@
 "file a bug report."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Unexpected Exception"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14889,5 +15003,5 @@
 "sure you have updated to the latest version of JOSM here:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14897,5 +15011,5 @@
 "bug report in our bugtracker using this link:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14907,5 +15021,5 @@
 "supply as much detail as possible."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14915,9 +15029,9 @@
 "information below at this URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(The text has already been copied to your clipboard.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "You have encountered a bug in JOSM"
@@ -15164,5 +15278,5 @@
 "<br><br>The error message is:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15223,5 +15337,5 @@
 msgstr "unused"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15234,5 +15348,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15242,5 +15356,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15251,5 +15365,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hint: You can edit the shortcuts in the preferences.)"
@@ -15364,5 +15478,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Visibility"
@@ -15448,10 +15562,61 @@
 msgstr "Uploads traces to openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Opening Hours"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Change properties of up to {0} object"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Choose"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Way {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Tool: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "open"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15623,51 +15788,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Cannot add a node outside of the world."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15766,16 +15933,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15789,5 +15948,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15900,5 +16059,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Buildings"
@@ -16148,5 +16307,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16588,8 +16747,4 @@
 msgstr "East"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "North"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16711,6 +16866,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Blank Layer"
@@ -18090,5 +18245,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Public Transport"
@@ -18132,48 +18287,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Waypoints"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "load data from API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "imported data from {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "create new objects"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "change the selection"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "change the viewport"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "confirm all Remote Control actions manually"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "A plug-in that allows JOSM to be controlled from other applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Settings for the Remote Control plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18185,34 +18345,34 @@
 "talking to the plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Confirm Remote Control action"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Remote Control has been asked to create a new node."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control has been asked to import data from the following URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control has been asked to load data from the API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18435,58 +18595,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Show Tile Info"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Snap to tile size"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "autoload tiles"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Settings for the SlippyMap plug-in."
@@ -18771,11 +18931,10 @@
 msgstr "Terrace"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Edit Pipeline"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19860,5 +20019,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19983,59 +20142,59 @@
 msgstr "Overlapping ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20520,143 +20679,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "bump"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Please enter a tile index"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Stile"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20676,7 +20832,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multiple"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20782,12 +20937,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Select with the given search"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Waypoints"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20804,9 +20957,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Exception occurred"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Not in cache"
@@ -20867,21 +21020,21 @@
 msgstr "Adjust the position of the selected WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Please select the WMS layer to adjust."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Select WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Start adjusting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "There are currently no WMS layer to adjust."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "No layers to adjust"
@@ -20892,5 +21045,5 @@
 msgstr "Download WMS tile from {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20901,5 +21054,5 @@
 "or a trailing '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20909,10 +21062,10 @@
 "settings."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Warning: The complete URL is ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20923,24 +21076,24 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20955,17 +21108,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20973,58 +21126,83 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Could not find the map object."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Open a blank WMS layer to load data from a file"
@@ -21093,8 +21271,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Remote Control has been asked to import data from the following URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21612,16 +21789,21 @@
 "mouse moving (general Java - tablet problem)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21630,5 +21812,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21637,5 +21819,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21646,5 +21828,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21655,10 +21837,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21667,15 +21849,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21685,5 +21867,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21694,10 +21876,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21706,5 +21888,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21715,15 +21897,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21736,15 +21918,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21753,5 +21935,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21762,5 +21944,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21769,10 +21951,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21783,5 +21965,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21791,5 +21973,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21800,20 +21982,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21824,5 +22006,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21865,4 +22047,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21895,10 +22078,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Highways"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Streets"
@@ -21909,5 +22092,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorway"
@@ -21916,5 +22099,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Edit Motorway"
@@ -21951,10 +22134,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Reference"
@@ -21968,8 +22151,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Lanes"
@@ -21988,13 +22171,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -22028,17 +22211,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Oneway"
@@ -22075,17 +22258,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22119,17 +22302,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -22160,17 +22343,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Cutting"
@@ -22201,17 +22384,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Embankment"
@@ -22219,5 +22402,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Motorway Link"
@@ -22226,5 +22409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Edit Motorway Link"
@@ -22232,5 +22415,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Trunk"
@@ -22239,5 +22422,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Edit Trunk"
@@ -22247,6 +22430,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Motorroad"
@@ -22254,5 +22437,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -22261,5 +22444,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Edit Trunk Link"
@@ -22272,5 +22455,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primary"
@@ -22279,5 +22462,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Edit Primary Road"
@@ -22285,10 +22468,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Primary Link"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Edit Primary Link"
@@ -22300,5 +22483,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondary"
@@ -22308,5 +22491,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Edit Secondary Road"
@@ -22314,5 +22497,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Tertiary"
@@ -22322,5 +22505,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Edit Tertiary Road"
@@ -22332,5 +22515,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -22340,5 +22523,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Edit Unclassified Road"
@@ -22348,6 +22531,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Passing Places"
@@ -22370,15 +22553,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -22390,5 +22573,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -22397,5 +22580,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Edit Residential Street"
@@ -22415,12 +22598,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Surface"
@@ -22442,166 +22625,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "paved"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "unpaved"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asphalt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "concrete"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "wood"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "paving_stones"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "cobblestone"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "pebblestone"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "compacted"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "grass_paver"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "grass"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "ground"
@@ -22609,5 +22792,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Living Street"
@@ -22616,5 +22799,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Edit Living Street"
@@ -22622,5 +22805,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -22629,5 +22812,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Edit Pedestrian Street"
@@ -22635,5 +22818,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Service"
@@ -22642,5 +22825,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Edit Serviceway"
@@ -22650,18 +22833,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Serviceway type"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "alley"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -22669,5 +22852,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Parking Aisle"
@@ -22677,10 +22860,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Edit Parking Aisle"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -22689,5 +22872,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -22695,14 +22878,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Edit Highway Under Construction"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Junction"
@@ -22718,5 +22901,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "roundabout"
@@ -22725,5 +22908,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
@@ -22732,15 +22915,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -22748,5 +22931,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Access"
@@ -22772,4 +22955,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22777,4 +22961,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22850,236 +23040,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "private"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "agricultural"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "forestry"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "delivery"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "no"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Agricultural"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "designated"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "private"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "agricultural"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "forestry"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "delivery"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "no"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Agricultural"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "designated"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "official"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -23094,10 +23291,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Horse"
@@ -23113,10 +23310,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -23131,19 +23329,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -23151,20 +23349,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
@@ -23172,5 +23370,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -23181,5 +23379,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -23199,10 +23397,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -23224,10 +23422,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -23249,10 +23447,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "primary_link"
@@ -23274,5 +23472,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23287,9 +23485,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "unclassified"
@@ -23303,9 +23501,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "living_street"
@@ -23349,10 +23547,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -23382,5 +23580,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23392,10 +23590,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -23403,10 +23601,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Track"
@@ -23415,35 +23613,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Edit Track"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Tracktype"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB Scale"
@@ -23451,5 +23649,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Path"
@@ -23458,76 +23656,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Edit Path"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC Scale"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "mountain_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "demanding_mountain_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "alpine_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "demanding_alpine_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "difficult_alpine_hiking"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "excellent"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "good"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "bad"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "horrible"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -23536,5 +23734,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Dedicated Bridleway"
@@ -23542,5 +23740,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Edit Bridleway"
@@ -23548,5 +23746,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Dedicated Cycleway"
@@ -23564,11 +23762,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Edit Cycleway"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Pedestrians"
@@ -23576,5 +23774,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Segregated Foot- and Cycleway"
@@ -23582,5 +23780,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Combined Foot- and Cycleway"
@@ -23588,5 +23786,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Dedicated Footway"
@@ -23595,5 +23793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Edit Footway"
@@ -23601,5 +23799,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Steps"
@@ -23609,10 +23807,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Amount of Seats"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -23620,15 +23824,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Services"
@@ -23636,5 +23840,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -23642,10 +23846,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23674,36 +23879,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operator"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "stream"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Edit Restaurant"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Emergency Phone"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -23713,5 +23939,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -23720,27 +23946,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -23748,6 +23974,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -23756,11 +23982,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -23768,30 +23994,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -23799,67 +24025,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Pedestrian Crossing"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Edit Crossing"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Type name (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Traffic Calming"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Edit Traffic Calming"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "bump"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "choker"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "cushion"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "hump"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "table"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Passing Place"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Edit Passing Place"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -23870,14 +24034,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Pedestrian Crossing"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Edit Crossing"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Type name (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Traffic Calming"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Edit Traffic Calming"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "bump"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "choker"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "cushion"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "hump"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "table"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Passing Place"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Edit Passing Place"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -23887,5 +24113,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "City Limit"
@@ -23893,15 +24119,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -23910,11 +24136,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Emergency Phone"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Incline"
@@ -23922,5 +24143,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -23928,5 +24149,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Grit Bin"
@@ -23936,10 +24157,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Ford"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -23947,5 +24168,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -23953,5 +24174,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -23960,10 +24181,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Elevation"
@@ -23971,5 +24192,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barriers"
@@ -23977,5 +24198,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Bollard"
@@ -23983,5 +24204,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -24026,16 +24247,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -24044,5 +24265,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Block"
@@ -24050,5 +24271,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -24056,10 +24277,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -24067,15 +24288,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -24083,5 +24304,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -24089,10 +24310,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -24101,5 +24322,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Hedge"
@@ -24110,22 +24331,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Fence"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "fence"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "wood_fence"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "wire_fence"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Wall"
@@ -24133,5 +24354,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "City Wall"
@@ -24140,5 +24361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -24149,10 +24370,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
@@ -24160,5 +24381,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Gate"
@@ -24166,50 +24387,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Stile"
@@ -24217,25 +24438,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Turnstile"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Edit Turnstile"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -24243,25 +24464,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Spring"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Edit Spring"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Drain"
@@ -24269,10 +24479,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Ditch"
@@ -24280,10 +24490,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Edit Ditch"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Stream"
@@ -24291,10 +24501,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Canal"
@@ -24302,10 +24512,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "River"
@@ -24315,59 +24525,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Edit River"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Spring"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Edit Spring"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Waterfall"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Edit Waterfall"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Weir"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Edit Weir"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Dam"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Edit Dam"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Basin"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Edit Basin Landuse"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Reservoir"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Edit Reservoir Landuse"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Covered Reservoir"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Edit Covered Reservoir"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Edit Land"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Basin"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Edit Basin Landuse"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Reservoir"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Edit Reservoir Landuse"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Covered Reservoir"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Edit Covered Reservoir"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Coastline"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Edit Coastline"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -24376,10 +24640,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Wetland"
@@ -24390,14 +24655,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "bog"
@@ -24411,35 +24676,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Mud"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Beach"
@@ -24447,20 +24712,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Bay"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Cliff"
@@ -24468,145 +24733,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Coastline"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Edit Coastline"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Shopping"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Ferry Terminal"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Edit Ferry Terminal"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Car"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "novice"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicycle"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ferry Route"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Boatyard"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Edit Boatyard"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dock"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Edit Dock"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Dam"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Edit Dam"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Waterway Point"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Marina"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Edit Marina"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Pier"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Edit Pier"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Lock Gate"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Weir"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Edit Weir"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Waterfall"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Edit Waterfall"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Turning Point"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Edit Marina"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Pier"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Edit Pier"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Ferry Terminal"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Edit Ferry Terminal"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Slipway"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24616,16 +24952,38 @@
 msgstr "Edit Slipway"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Boatyard"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Edit Boatyard"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dock"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Edit Dock"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Railway"
@@ -24633,5 +24991,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -24661,7 +25019,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Gauge (mm)"
@@ -24677,8 +25035,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Types"
@@ -24692,29 +25050,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Electrified"
@@ -24727,8 +25085,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "contact_line"
@@ -24799,8 +25157,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24812,8 +25170,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltage"
@@ -24826,8 +25184,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frequency (Hz)"
@@ -24840,23 +25198,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24864,50 +25222,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Subway"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -24915,5 +25273,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -24922,10 +25280,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
@@ -24934,9 +25292,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Optional Types"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -24945,5 +25303,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -24952,5 +25310,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Crossing"
@@ -24960,5 +25318,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -24966,5 +25324,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Turntable"
@@ -24973,5 +25331,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Buffer Stop"
@@ -24980,10 +25338,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -24991,10 +25349,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -25002,10 +25360,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -25013,10 +25371,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondola"
@@ -25024,10 +25382,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25036,5 +25395,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25042,5 +25401,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25049,5 +25408,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25055,5 +25414,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Fuel"
@@ -25063,69 +25422,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indipend."
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25142,34 +25524,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25177,37 +25560,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Opening Hours"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25228,33 +25622,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25263,170 +25659,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "shop"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Convenience Store"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel for Heavy Good Vehicles"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 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:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
@@ -25434,4 +25852,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25443,6 +25862,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parking"
@@ -25451,5 +25870,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -25460,25 +25879,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -25487,54 +25908,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Capacity (overall)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Spaces for Women"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Spaces for Parents"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Wash"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Car Dealer"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Edit Car Shop"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Repair"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Types"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Edit Tree"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Content"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Phone Number"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Rental"
@@ -25543,10 +26108,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Sharing"
@@ -25554,28 +26118,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Edit Bicycle Parking"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacity"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorcycle"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Edit Motorway"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Services"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Scale"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "bad"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Presets"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Clothes"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Bike Dealer"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Edit Bicycle Shop"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25585,5 +26208,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25591,5 +26214,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -25597,5 +26220,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -25603,5 +26226,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -25609,5 +26232,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -25616,5 +26239,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -25622,5 +26245,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -25629,5 +26252,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -25639,5 +26262,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -25645,10 +26268,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -25657,10 +26280,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -25669,5 +26292,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -25676,5 +26299,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -25682,5 +26305,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -25690,13 +26313,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Shelter"
@@ -25704,19 +26326,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Bench"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Tactile Paving"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -25724,5 +26346,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -25730,5 +26352,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -25736,10 +26358,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Airport"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Airport Ground"
@@ -25747,5 +26369,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Edit Airport Ground"
@@ -25753,10 +26375,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25765,5 +26387,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Runway"
@@ -25771,5 +26393,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Edit Runway"
@@ -25777,5 +26399,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Taxiway"
@@ -25783,5 +26405,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Edit Taxiway"
@@ -25789,5 +26411,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Helipad"
@@ -25795,5 +26417,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Edit Helipad"
@@ -25803,5 +26425,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Apron"
@@ -25811,5 +26433,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25820,6 +26442,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Beacon"
@@ -25829,5 +26451,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Windsock"
@@ -25836,5 +26458,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -25842,5 +26464,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Edit Terminal"
@@ -25848,15 +26470,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Edit Terminal Gate"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Travel"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -25868,5 +26490,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25875,5 +26497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
@@ -25886,8 +26508,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stars"
@@ -25911,34 +26533,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25952,168 +26574,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Phone Number"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26121,20 +26648,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Chalet"
@@ -26142,10 +26669,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Hostel"
@@ -26153,30 +26680,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -26184,10 +26712,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -26198,5 +26726,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26204,5 +26732,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -26210,5 +26738,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -26216,79 +26746,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -26296,18 +26826,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "chicken"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26315,10 +26845,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Cafe"
@@ -26326,10 +26856,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -26337,20 +26872,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -26358,10 +26893,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -26369,25 +26904,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -26395,9 +26930,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -26406,9 +26941,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Theme Park"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Edit Theme Park"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Artwork"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Edit Artwork"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -26416,50 +26972,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Theme Park"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Edit Theme Park"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Artwork"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Edit Artwork"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Edit Shelter"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Fireplace"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Picnic Site"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Edit Picnic Site"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topo"
@@ -26497,5 +27054,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26503,28 +27060,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -26534,5 +27091,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -26540,5 +27097,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Hiking"
@@ -26546,6 +27103,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cycling"
@@ -26553,5 +27110,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -26559,6 +27116,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skiing"
@@ -26566,5 +27123,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Riding"
@@ -26572,46 +27129,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26620,5 +27177,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -26626,55 +27183,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Edit Shelter"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Fireplace"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Picnic Site"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Edit Picnic Site"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Castle"
@@ -26683,19 +27219,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -26704,9 +27240,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -26714,10 +27250,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -26725,5 +27261,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -26731,15 +27267,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Memorial"
@@ -26747,55 +27283,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Playground"
@@ -26803,35 +27339,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -26845,6 +27381,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "select sport:"
@@ -27260,6 +27796,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27294,240 +27830,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -27544,5 +28080,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27569,23 +28104,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "type"
@@ -27602,5 +28145,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27627,211 +28169,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motor Sports"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Edit Motor Sports"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -27839,52 +28384,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Shooting"
@@ -27892,204 +28437,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motor Sports"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Edit Motor Sports"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Warning"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Edit Parking"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Motorcar"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Edit Motor Sports"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Edit Skating"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Edit Border Control point"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Car"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Edit Cable Car"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Building"
@@ -28097,5 +28708,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Public Building"
@@ -28103,10 +28714,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Town hall"
@@ -28114,10 +28725,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Embassy"
@@ -28125,10 +28736,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -28137,10 +28748,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Prison"
@@ -28149,10 +28760,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Police"
@@ -28162,10 +28773,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -28174,10 +28785,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Post Office"
@@ -28185,5 +28796,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -28191,15 +28802,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "School"
@@ -28207,10 +28818,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "University"
@@ -28218,10 +28829,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "College"
@@ -28229,5 +28840,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Edit College"
@@ -28235,5 +28846,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cinema"
@@ -28242,10 +28853,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Library"
@@ -28254,9 +28865,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -28264,10 +28875,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Theatre"
@@ -28276,10 +28887,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -28289,5 +28900,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -28296,6 +28907,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -28304,66 +28915,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Denomination"
@@ -28372,189 +28983,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunni"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Addresses"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Edit Address Information"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "House number"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "House name"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Street name"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "City name"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Post code"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Country code"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Edit Address Interpolation"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Numbering scheme"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "odd"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "even"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alphabetic"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -28562,25 +29103,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -28588,10 +29129,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Windmill"
@@ -28599,10 +29140,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28611,41 +29152,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -28655,10 +29196,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Crane"
@@ -28666,5 +29207,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -28672,10 +29213,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -28683,10 +29224,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28694,23 +29235,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -28720,35 +29261,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Power Station"
@@ -28757,10 +29298,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -28769,5 +29310,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -28775,10 +29316,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -28789,23 +29330,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Power Line"
@@ -28814,20 +29355,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28835,55 +29376,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telephone"
@@ -28892,5 +29433,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -28898,5 +29439,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Coins"
@@ -28904,5 +29445,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Notes"
@@ -28910,5 +29451,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -28916,5 +29457,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -28922,15 +29463,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recycling"
@@ -28939,5 +29480,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -28945,35 +29486,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Cans"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Clothes"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -28981,5 +29517,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -28988,31 +29524,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "brown"
@@ -29091,5 +29627,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29099,31 +29635,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -29131,31 +29667,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fountain"
@@ -29164,10 +29700,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -29176,10 +29712,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -29188,5 +29724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -29194,501 +29730,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Foot"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Edit Supermarket"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Convenience Store"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Edit Convenience Store"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Edit Kiosk"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Butcher"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Edit Butcher"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Baker"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Edit Baker"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Organic"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Edit Organic Shop"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alcohol"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Edit Alcohol Shop"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Beverages"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Edit Beverages Shop"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Shops"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Chemist"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Edit Chemist"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Hairdresser"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Edit Hairdresser"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optician"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Edit Optician"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Edit Computer Shop"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Shoes"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Edit Shoe Shop"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Outdoor"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Edit Outdoor Shop"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Edit Sports Shop"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Dry Cleaning"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Edit Dry Cleaning"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Laundry"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Edit Laundry"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "railover"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Edit Railway"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Edit Computer Shop"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Electronics"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Edit Electronics Shop"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Edit Hifi Shop"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Edit Video Shop"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Florist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Edit Florist"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Garden Centre"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Edit Garden Centre"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Hardware"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Edit Hardware Store"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Do-it-yourself-store"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Edit Do-it-yourself-store"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Furniture"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Edit Furniture Shop"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Stationery"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Edit Stationery Shop"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Book Store"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Edit Book Store"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Travel Agency"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Edit Travel Agency"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Toys"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Edit Toy Shop"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Vending machine"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Edit Vending machine"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Vending products"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "public_transport_tickets"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "public_transport_plans"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "parking_tickets"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "food"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "drinks"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "sweets"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigarettes"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "photos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "animal_food"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "news_papers"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "toys"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "stamps"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-cards"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telephone_vouchers"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "vouchers"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "condoms"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampons"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "excrement_bags"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Account or loyalty cards"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Cash"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Bank"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Edit Bank"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Automated Teller Machine"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Money Exchange"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Edit Money Exchange"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Edit Automated Teller Machine"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Health"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Doctors"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Edit Doctors"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dentist"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Edit Dentist"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Pharmacy"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Edit Pharmacy"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Dispensing"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hospital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Edit Hospital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Shops"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Car Dealer"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Edit Car Shop"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Bike Dealer"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Edit Bicycle Shop"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Edit Supermarket"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Chemist"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Edit Chemist"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Convenience Store"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Edit Convenience Store"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Edit Kiosk"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Book Store"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Edit Book Store"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Travel Agency"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Edit Travel Agency"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Butcher"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Edit Butcher"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Baker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Edit Baker"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Florist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Edit Florist"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Organic"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Edit Organic Shop"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alcohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Edit Alcohol Shop"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Beverages"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Edit Beverages Shop"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Edit Computer Shop"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Electronics"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Edit Electronics Shop"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Edit Hifi Shop"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Furniture"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Edit Furniture Shop"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Garden Centre"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Edit Garden Centre"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Hardware"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Edit Hardware Store"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Do-it-yourself-store"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Edit Do-it-yourself-store"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Stationery"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Edit Stationery Shop"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Hairdresser"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Edit Hairdresser"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Shoes"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Edit Shoe Shop"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Toys"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Edit Toy Shop"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Edit Video Shop"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Dry Cleaning"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Edit Dry Cleaning"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Laundry"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Edit Laundry"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Outdoor"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Edit Outdoor Shop"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Edit Sports Shop"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optician"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Edit Optician"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Vending machine"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Edit Vending machine"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Vending products"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "public_transport_tickets"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "public_transport_plans"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "parking_tickets"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "food"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "drinks"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "sweets"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigarettes"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "photos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "animal_food"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "news_papers"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "toys"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "stamps"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-cards"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telephone_vouchers"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "vouchers"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "condoms"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampons"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "excrement_bags"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Account or loyalty cards"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Cash"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Bank"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Edit Bank"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Automated Teller Machine"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Money Exchange"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Edit Money Exchange"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Edit Automated Teller Machine"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Health"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Doctors"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Edit Doctors"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dentist"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Edit Dentist"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Pharmacy"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Edit Pharmacy"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Dispensing"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hospital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Edit Hospital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -29697,5 +30235,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -29704,15 +30242,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -29720,5 +30258,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -29727,368 +30265,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Boundaries"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "National"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Edit National Boundary"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrative"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Edit Administrative Boundary"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Edit Civil Boundary"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Political"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Edit Political Boundary"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "National park"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Edit National Park Boundary"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Places"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Country"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Edit Country"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "State"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Edit State"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Edit Region"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "County"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Edit County"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "City"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Edit City"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Town"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Edit Town"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Suburb"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Village"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Edit Village"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Hamlet"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Locality"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Peak"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Edit Peak"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glacier"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Edit Glacier"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Volcano"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Edit Volcano"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Cave Entrance"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Edit Cave Entrance"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Island"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Edit Island"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Islet"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Edit Islet"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "nature"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Tree"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Edit Tree"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanical Name"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Wood"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Edit Wood"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "coniferous"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "deciduous"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "mixed"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Forest"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Edit Forest Landuse"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Nature Reserve"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Edit Nature Reserve"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Cave Entrance"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Edit Cave Entrance"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Peak"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Edit Peak"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glacier"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Edit Glacier"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Volcano"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Edit Volcano"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Boundaries"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "National"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Edit National Boundary"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrative"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Edit Administrative Boundary"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Edit Civil Boundary"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Political"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Edit Political Boundary"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "National park"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Edit National Park Boundary"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Scree"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Edit Scree"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Fell"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Edit Fell"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Scrub"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Edit Scrub"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Heath"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Edit Heath"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Tree"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Edit Tree"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanical Name"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Wood"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Edit Wood"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "coniferous"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "deciduous"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "mixed"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Forest"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Edit Forest Landuse"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Nature Reserve"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Edit Nature Reserve"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Scree"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Edit Scree"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Scrub"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Edit Scrub"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Fell"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Edit Fell"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Heath"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Edit Heath"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -30097,45 +30641,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -30143,25 +30687,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Village Green"
@@ -30169,10 +30713,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Common"
@@ -30180,20 +30724,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -30201,5 +30745,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -30207,15 +30751,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -30223,9 +30767,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -30233,39 +30777,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Railway land"
@@ -30273,15 +30817,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -30289,52 +30833,186 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Station"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Addresses"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Edit Address Information"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "House number"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "House name"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Street name"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "City name"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Post code"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Country code"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Edit Address Interpolation"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Numbering scheme"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "odd"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "even"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alphabetic"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Content"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Add author information"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "image "
 
 #. item "Relations/Multipolygon"
@@ -30342,5 +31020,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -30352,5 +31030,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "outer segment"
@@ -30358,5 +31036,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "inner segment"
@@ -30364,5 +31042,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -30373,5 +31051,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -30379,36 +31057,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -30416,5 +31094,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -30423,5 +31101,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -30429,34 +31107,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -30465,15 +31143,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "to way"
@@ -30481,5 +31159,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Route"
@@ -30488,5 +31166,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -30494,132 +31172,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Route type"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicycle"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -30687,5 +31254,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30695,9 +31262,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "detour"
@@ -30711,10 +31278,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -30722,31 +31289,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -30755,30 +31322,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -34756,7 +35323,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34878,8 +35444,14 @@
 msgstr "Sicily - Italy"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Keep backup files"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Waterway Point"
 
 #~ msgid "The selected way does not contain the selected node."
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 22859)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 22863)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-05-16 13:46+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -97,5 +97,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Warning"
@@ -123,9 +123,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -133,5 +133,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -255,5 +255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -280,5 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -303,5 +303,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -412,4 +412,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -427,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1069,5 +1070,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1468,13 +1469,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1483,5 +1484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1489,9 +1490,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1499,5 +1500,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1531,8 +1532,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1541,9 +1542,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1559,6 +1560,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1568,5 +1569,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1591,6 +1592,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Error"
@@ -1752,5 +1753,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "No, abort"
@@ -2037,5 +2038,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2511,5 +2512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2553,9 +2554,9 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2563,9 +2564,9 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2844,5 +2845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Search"
@@ -3041,7 +3042,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3311,5 +3312,5 @@
 msgstr[1] "Move {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3467,31 +3468,31 @@
 msgstr "Automatic tag correction"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3510,15 +3511,15 @@
 msgstr "Illegal longitude value ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Warning: failed to persist preferences to ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Malformed config file at lines {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3529,5 +3530,5 @@
 "not a directory."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3538,5 +3539,5 @@
 "not a directory.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3547,5 +3548,5 @@
 "preference directory: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3556,5 +3557,5 @@
 "preference directory: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3563,5 +3564,5 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3572,5 +3573,5 @@
 "file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3581,5 +3582,5 @@
 "to default: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3590,5 +3591,5 @@
 "<br> and creating a new default preference file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3599,10 +3600,10 @@
 "default: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3729,5 +3730,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3804,9 +3805,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3816,5 +3817,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4009,15 +4010,34 @@
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zone"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "North"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "south"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Jump there"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4041,9 +4061,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4087,5 +4107,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "railway"
@@ -4106,5 +4126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4359,69 +4379,69 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4435,9 +4455,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4447,57 +4467,66 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debit cards"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Preference setting {0} has been removed since it is no longer used."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4507,9 +4536,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4523,9 +4552,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4649,23 +4679,23 @@
 msgstr "User:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4763,5 +4793,5 @@
 msgstr "Click to close the dialogue and to abort deleting the objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4771,17 +4801,17 @@
 "level.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Zoom level:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "from tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "up to tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4795,25 +4825,25 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Tile address:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Apply the tile address"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Please enter a tile address"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "The current value isn''t a valid tile address"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Please enter a tile index"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "The current value isn''t a valid tile index for the given zoom level"
@@ -5231,4 +5261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5311,4 +5342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5325,4 +5357,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5396,5 +5429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5406,10 +5439,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "none"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "all"
@@ -5491,5 +5524,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5501,5 +5534,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5534,17 +5567,17 @@
 msgstr "Not decided yet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Enter a role for all relation memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Tag modified relations with "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5554,15 +5587,15 @@
 "modified relations.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Key:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5570,5 +5603,5 @@
 msgstr "Value:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5576,5 +5609,5 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5592,5 +5625,5 @@
 "place of the original way in the relation.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5608,5 +5641,5 @@
 "the place of the original node in the relation.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Apply this role to all members"
@@ -5752,5 +5785,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5869,5 +5902,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5875,5 +5908,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5881,5 +5914,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5887,5 +5920,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5893,5 +5926,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5900,5 +5933,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5906,5 +5939,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5912,5 +5945,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5918,24 +5951,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5956,5 +5989,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5979,37 +6012,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Enter the coordinates for the new node."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Use decimal degrees."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative values denote Western/Southern hemisphere."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Please enter a valid latitude in the range -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Please enter a latitude in the range -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Please enter a valid longitude in the range -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Please enter a longitude in the range -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Close the dialogue and create a new node"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Close the dialogue, do not create a new node"
@@ -6065,9 +6098,9 @@
 msgstr "Information about layer"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relations"
@@ -6115,10 +6148,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Download incomplete members of selected relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Download incomplete members"
@@ -6138,37 +6171,37 @@
 msgstr "Open a selection list window."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Search for objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zoom to selected element(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6177,27 +6210,27 @@
 msgstr "Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6205,5 +6238,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -6490,13 +6523,13 @@
 msgstr "Nothing to zoom to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "The content of this changeset is not downloaded yet."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Download now"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Download the changeset content"
@@ -6608,4 +6641,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6624,6 +6661,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6641,8 +6676,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6653,4 +6695,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6665,33 +6713,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6715,12 +6752,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6792,10 +6839,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6825,8 +6876,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6889,6 +6936,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6941,4 +6986,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7003,32 +7060,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7037,6 +7102,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7045,24 +7112,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7077,82 +7134,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7233,155 +7290,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Name"
@@ -7846,4 +7908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<different>"
@@ -8376,17 +8439,17 @@
 msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "including immediate children of parent relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Load parent relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Loading parent relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Edit the currently selected relation"
@@ -8671,4 +8734,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8676,15 +8740,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Type"
@@ -8703,16 +8767,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "unknown"
@@ -9333,5 +9397,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Launch a file chooser to select a file"
@@ -9576,20 +9640,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Layer"
@@ -10073,5 +10137,63 @@
 msgstr[1] "{0} objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Description: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} track"
+msgstr[1] "{0} tracks"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Timespan"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Length"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Length: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10079,62 +10201,17 @@
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Description: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} track"
 msgstr[1] "{0} tracks"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Description"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Timespan"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Length"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Length: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} route, "
-msgstr[1] "{0} routes, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10144,10 +10221,10 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10158,7 +10235,7 @@
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10166,10 +10243,10 @@
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10177,10 +10254,10 @@
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10188,21 +10265,21 @@
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10214,9 +10291,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10226,5 +10303,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10234,30 +10311,30 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10265,5 +10342,5 @@
 msgstr "Customise Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10272,5 +10349,5 @@
 msgstr "Default"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10279,18 +10356,18 @@
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10303,23 +10380,23 @@
 "them with audio data.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import not possible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10773,15 +10850,15 @@
 msgstr "Image file could not be deleted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "No image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Loading {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11817,4 +11894,48 @@
 msgid "Voice recorder calibration"
 msgstr "Voice recorder calibration"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Update interval (in days):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Default value is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "When saving, keep backup files ending with a ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "File backup"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Configure whether to create backup files"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11898,5 +12019,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Car"
@@ -11915,16 +12036,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicycle"
@@ -11958,12 +12079,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Foot"
@@ -12222,18 +12343,18 @@
 msgstr "Default (Auto determined)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Enable built-in defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Enable built-in icon defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Used style"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
@@ -12580,27 +12701,19 @@
 msgstr "The projection {0} could not be activated. Using Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Proxy settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "File backup"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "Configure your identity and how to authenticate at the OSM server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Configure whether to use a proxy server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Configure whether to create backup files"
 
 #. 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
@@ -12717,6 +12830,15 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternate"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12954,12 +13076,4 @@
 "authentication method ''Basic Authentication''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Keep backup files"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "When saving, keep backup files ending with a ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13152,5 +13266,5 @@
 msgstr "Add a new tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13161,49 +13275,49 @@
 "be the same as in values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13213,15 +13327,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13231,17 +13345,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13879,5 +13993,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13987,5 +14101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13994,5 +14108,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14063,5 +14177,5 @@
 msgstr "File \"{0}\" does not exist"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14073,10 +14187,10 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Found XML element <nd> not as direct child of element <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14084,5 +14198,5 @@
 msgstr "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14090,5 +14204,5 @@
 msgstr "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14096,10 +14210,10 @@
 msgstr "Deleted way {0} contains nodes"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr "Found XML element <member> not as direct child of element <relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14107,5 +14221,5 @@
 msgstr "Missing attribute ''ref'' on member in relation {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14113,5 +14227,5 @@
 msgstr "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14119,5 +14233,5 @@
 msgstr "Missing attribute ''type'' on member {0} in relation {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14127,10 +14241,10 @@
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member> specification with ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14138,9 +14252,9 @@
 msgstr "Deleted relation {0} contains members"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14148,11 +14262,11 @@
 msgstr "Undefined element ''{0}'' found in input stream. Skipping."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Illegal object with id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14166,8 +14280,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14183,5 +14297,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14189,5 +14303,5 @@
 msgstr "Unknown or unsupported API version. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14196,6 +14310,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14209,6 +14323,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14217,5 +14331,5 @@
 msgstr "Illegal value for attribute ''changeset''. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14223,5 +14337,5 @@
 msgstr "Missing required attribute ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14229,13 +14343,13 @@
 msgstr "Illegal long value for attribute ''{0}''. Got ''{1}''."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14243,5 +14357,5 @@
 msgstr "Deleted node {0} is part of way {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14253,5 +14367,5 @@
 "missing in the loaded data."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14263,5 +14377,5 @@
 "external id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14269,17 +14383,17 @@
 msgstr "Deleted member {0} is used by relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Parsing OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Preparing data set..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14818,11 +14932,11 @@
 msgstr "Download plug-in list..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Downloading plug-in list from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14833,16 +14947,16 @@
 "list from plug-in site ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Writing plug-in list to local cache ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Parsing plug-in list from site ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14853,5 +14967,5 @@
 "Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14872,13 +14986,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Report Bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14890,9 +15004,9 @@
 "file a bug report."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Unexpected Exception"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14902,5 +15016,5 @@
 "sure you have updated to the latest version of JOSM here:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14910,5 +15024,5 @@
 "bug report in our bugtracker using this link:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14920,5 +15034,5 @@
 "supply as much detail as possible."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14928,9 +15042,9 @@
 "information below at this URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(The text has already been copied to your clipboard.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "You have encountered a bug in JOSM"
@@ -15185,5 +15299,5 @@
 "<br><br>The error message is:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15244,5 +15358,5 @@
 msgstr "unused"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15255,5 +15369,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15263,5 +15377,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15272,5 +15386,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hint: You can edit the shortcuts in the preferences.)"
@@ -15385,5 +15499,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Visibility"
@@ -15469,10 +15583,61 @@
 msgstr "Uploads traces to openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Opening Hours"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Change properties of up to {0} object"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Choose"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Way {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Tool: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "open"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15644,51 +15809,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Cannot add a node outside of the world."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' must not be null"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' must not be null"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15787,16 +15954,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15810,5 +15969,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15921,5 +16080,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Buildings"
@@ -16171,5 +16330,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16611,8 +16770,4 @@
 msgstr "East"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "North"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16734,6 +16889,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Blank Layer"
@@ -18113,5 +18268,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Public Transport"
@@ -18155,48 +18310,53 @@
 msgstr "Tracks"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Waypoints"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "load data from API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "imported data from {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "create new objects"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "change the selection"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "change the viewport"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "confirm all Remote Control actions manually"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "A plug-in that allows JOSM to be controlled from other applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Settings for the Remote Control plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18208,34 +18368,34 @@
 "talking to the plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Confirm Remote Control action"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Remote Control has been asked to create a new node."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control has been asked to import data from the following URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control has been asked to load data from the API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18458,58 +18618,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Show Tile Info"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Snap to tile size"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "autoload tiles"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Settings for the SlippyMap plug-in."
@@ -18794,11 +18954,10 @@
 msgstr "Terrace"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Edit Pipeline"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19903,5 +20062,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20026,59 +20185,59 @@
 msgstr "Overlapping ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20563,143 +20722,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "bump"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Please enter a tile index"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Stile"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20719,7 +20875,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multiple"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20825,12 +20980,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Select with the given search"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Waypoints"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20847,9 +21000,9 @@
 msgstr "Select non-branching sequences of ways"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Exception occurred"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Not in cache"
@@ -20910,21 +21063,21 @@
 msgstr "Adjust the position of the selected WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Please select the WMS layer to adjust."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Select WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Start adjusting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "There are currently no WMS layer to adjust."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "No layers to adjust"
@@ -20935,5 +21088,5 @@
 msgstr "Download WMS tile from {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20944,5 +21097,5 @@
 "or a trailing '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20952,10 +21105,10 @@
 "settings."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Warning: The complete URL is ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20966,24 +21119,24 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20998,17 +21151,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21016,58 +21169,83 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Could not find the map object."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Open a blank WMS layer to load data from a file"
@@ -21136,8 +21314,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Remote Control has been asked to import data from the following URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21655,16 +21832,21 @@
 "mouse moving (general Java - tablet problem)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21673,5 +21855,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21680,5 +21862,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21689,5 +21871,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21698,10 +21880,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21710,15 +21892,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21728,5 +21910,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21737,10 +21919,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21749,5 +21931,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21758,15 +21940,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21779,15 +21961,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21796,5 +21978,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21805,5 +21987,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21814,10 +21996,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21828,5 +22010,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21836,5 +22018,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21845,20 +22027,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Select a sequence of non-branching connected ways"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21869,5 +22051,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21910,4 +22092,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21940,10 +22123,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Highways"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Streets"
@@ -21954,5 +22137,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorway"
@@ -21961,5 +22144,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Edit Motorway"
@@ -21996,10 +22179,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Reference"
@@ -22013,8 +22196,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Lanes"
@@ -22033,13 +22216,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -22073,17 +22256,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Oneway"
@@ -22120,17 +22303,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22164,17 +22347,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -22205,17 +22388,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Cutting"
@@ -22246,17 +22429,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Embankment"
@@ -22264,5 +22447,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Motorway Link"
@@ -22271,5 +22454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Edit Motorway Link"
@@ -22277,5 +22460,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Trunk"
@@ -22284,5 +22467,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Edit Trunk"
@@ -22292,6 +22475,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Motorroad"
@@ -22299,5 +22482,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -22306,5 +22489,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Edit Trunk Link"
@@ -22317,5 +22500,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primary"
@@ -22324,5 +22507,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Edit Primary Road"
@@ -22330,10 +22513,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Primary Link"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Edit Primary Link"
@@ -22345,5 +22528,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondary"
@@ -22353,5 +22536,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Edit Secondary Road"
@@ -22359,5 +22542,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Tertiary"
@@ -22367,5 +22550,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Edit Tertiary Road"
@@ -22377,5 +22560,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -22385,5 +22568,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Edit Unclassified Road"
@@ -22393,6 +22576,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Passing Places"
@@ -22415,15 +22598,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -22435,5 +22618,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -22442,5 +22625,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Edit Residential Street"
@@ -22460,12 +22643,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Surface"
@@ -22487,166 +22670,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "paved"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "unpaved"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asphalt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "concrete"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "wood"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "paving_stones"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "cobblestone"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "pebblestone"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "compacted"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "grass_paver"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "grass"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "ground"
@@ -22654,5 +22837,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Living Street"
@@ -22661,5 +22844,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Edit Living Street"
@@ -22667,5 +22850,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -22674,5 +22857,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Edit Pedestrian Street"
@@ -22680,5 +22863,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Service"
@@ -22687,5 +22870,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Edit Serviceway"
@@ -22695,18 +22878,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Serviceway type"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "alley"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -22714,5 +22897,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Parking Aisle"
@@ -22722,10 +22905,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Edit Parking Aisle"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -22734,5 +22917,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -22740,14 +22923,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Edit Highway Under Construction"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Junction"
@@ -22763,5 +22946,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "roundabout"
@@ -22770,5 +22953,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
@@ -22777,15 +22960,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -22793,5 +22976,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Access"
@@ -22817,4 +23000,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22822,4 +23006,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22895,236 +23085,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "private"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "agricultural"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "forestry"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "delivery"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "no"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Agricultural"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "designated"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "private"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "agricultural"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "forestry"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "delivery"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "no"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Agricultural"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "designated"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "official"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -23139,10 +23336,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Horse"
@@ -23158,10 +23355,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -23176,19 +23374,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -23196,20 +23394,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
@@ -23217,5 +23415,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -23226,5 +23424,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -23244,10 +23442,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -23269,10 +23467,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -23294,10 +23492,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "primary_link"
@@ -23319,5 +23517,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23332,9 +23530,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "unclassified"
@@ -23348,9 +23546,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "living_street"
@@ -23394,10 +23592,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -23427,5 +23625,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23437,10 +23635,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -23448,10 +23646,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Track"
@@ -23460,35 +23658,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Edit Track"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Tracktype"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB Scale"
@@ -23496,5 +23694,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Path"
@@ -23503,76 +23701,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Edit Path"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC Scale"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "mountain_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "demanding_mountain_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "alpine_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "demanding_alpine_hiking"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "difficult_alpine_hiking"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "excellent"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "good"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "bad"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "horrible"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -23581,5 +23779,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Dedicated Bridleway"
@@ -23587,5 +23785,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Edit Bridleway"
@@ -23593,5 +23791,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Dedicated Cycleway"
@@ -23609,11 +23807,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Edit Cycleway"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Pedestrians"
@@ -23621,5 +23819,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Segregated Foot- and Cycleway"
@@ -23627,5 +23825,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Combined Foot- and Cycleway"
@@ -23633,5 +23831,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Dedicated Footway"
@@ -23640,5 +23838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Edit Footway"
@@ -23646,5 +23844,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Steps"
@@ -23654,10 +23852,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Amount of Seats"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -23665,15 +23869,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Services"
@@ -23681,5 +23885,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -23687,10 +23891,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23719,36 +23924,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operator"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "stream"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Edit Restaurant"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Emergency Phone"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -23758,5 +23984,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -23765,27 +23991,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -23793,6 +24019,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -23801,11 +24027,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -23813,30 +24039,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -23844,67 +24070,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Pedestrian Crossing"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Edit Crossing"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Type name (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Traffic Calming"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Edit Traffic Calming"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "bump"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "choker"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "cushion"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "hump"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "table"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Passing Place"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Edit Passing Place"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -23915,14 +24079,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Pedestrian Crossing"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Edit Crossing"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Type name (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Traffic Calming"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Edit Traffic Calming"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "bump"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "choker"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "cushion"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "hump"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "table"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Passing Place"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Edit Passing Place"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -23932,5 +24158,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "City Limit"
@@ -23938,15 +24164,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -23955,11 +24181,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Emergency Phone"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Incline"
@@ -23967,5 +24188,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -23973,5 +24194,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Grit Bin"
@@ -23981,10 +24202,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Ford"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -23992,5 +24213,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -23998,5 +24219,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -24005,10 +24226,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Elevation"
@@ -24016,5 +24237,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barriers"
@@ -24022,5 +24243,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Bollard"
@@ -24028,5 +24249,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -24071,16 +24292,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -24089,5 +24310,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Block"
@@ -24095,5 +24316,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -24101,10 +24322,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -24112,15 +24333,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -24128,5 +24349,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -24134,10 +24355,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -24146,5 +24367,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Hedge"
@@ -24155,22 +24376,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Fence"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "fence"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "wood_fence"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "wire_fence"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Wall"
@@ -24178,5 +24399,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "City Wall"
@@ -24185,5 +24406,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -24194,10 +24415,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
@@ -24205,5 +24426,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Gate"
@@ -24211,50 +24432,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Stile"
@@ -24262,25 +24483,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Turnstile"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Edit Turnstile"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -24288,25 +24509,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Spring"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Edit Spring"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Drain"
@@ -24314,10 +24524,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Ditch"
@@ -24325,10 +24535,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Edit Ditch"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Stream"
@@ -24336,10 +24546,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Canal"
@@ -24347,10 +24557,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "River"
@@ -24360,59 +24570,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Edit River"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Spring"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Edit Spring"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Waterfall"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Edit Waterfall"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Weir"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Edit Weir"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Dam"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Edit Dam"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Basin"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Edit Basin Landuse"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Reservoir"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Edit Reservoir Landuse"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Covered Reservoir"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Edit Covered Reservoir"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Edit Land"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Basin"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Edit Basin Landuse"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Reservoir"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Edit Reservoir Landuse"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Covered Reservoir"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Edit Covered Reservoir"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Coastline"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Edit Coastline"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -24421,10 +24685,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Wetland"
@@ -24435,14 +24700,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "bog"
@@ -24456,35 +24721,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Mud"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Beach"
@@ -24492,20 +24757,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Bay"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Cliff"
@@ -24513,145 +24778,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Coastline"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Edit Coastline"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Shopping"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Ferry Terminal"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Edit Ferry Terminal"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Car"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "novice"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicycle"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ferry Route"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Boatyard"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Edit Boatyard"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dock"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Edit Dock"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Dam"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Edit Dam"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Waterway Point"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Marina"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Edit Marina"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Pier"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Edit Pier"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Lock Gate"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Weir"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Edit Weir"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Waterfall"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Edit Waterfall"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Turning Point"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Edit Marina"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Pier"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Edit Pier"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Ferry Terminal"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Edit Ferry Terminal"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Slipway"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24661,16 +24997,38 @@
 msgstr "Edit Slipway"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Boatyard"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Edit Boatyard"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dock"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Edit Dock"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Railway"
@@ -24678,5 +25036,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -24706,7 +25064,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Gauge (mm)"
@@ -24722,8 +25080,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Types"
@@ -24737,29 +25095,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Electrified"
@@ -24772,8 +25130,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "contact_line"
@@ -24844,8 +25202,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24857,8 +25215,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltage"
@@ -24871,8 +25229,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frequency (Hz)"
@@ -24885,23 +25243,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24909,50 +25267,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Subway"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -24960,5 +25318,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -24967,10 +25325,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
@@ -24979,9 +25337,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Optional Types"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -24990,5 +25348,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -24997,5 +25355,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Crossing"
@@ -25005,5 +25363,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -25011,5 +25369,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Turntable"
@@ -25018,5 +25376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Buffer Stop"
@@ -25025,10 +25383,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -25036,10 +25394,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -25047,10 +25405,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -25058,10 +25416,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondola"
@@ -25069,10 +25427,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25081,5 +25440,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25087,5 +25446,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25094,5 +25453,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25100,5 +25459,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Fuel"
@@ -25108,69 +25467,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indipend."
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25187,34 +25569,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25222,37 +25605,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Opening Hours"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25273,33 +25667,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25308,170 +25704,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "shop"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Convenience Store"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel for Heavy Good Vehicles"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 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:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
@@ -25479,4 +25897,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25488,6 +25907,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parking"
@@ -25496,5 +25915,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -25505,25 +25924,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -25532,54 +25953,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Capacity (overall)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Spaces for Women"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Spaces for Parents"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Wash"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Car Dealer"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Edit Car Shop"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Repair"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Types"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Edit Tree"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Content"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Phone Number"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Rental"
@@ -25588,10 +26153,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Sharing"
@@ -25599,28 +26163,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Edit Bicycle Parking"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacity"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorcycle"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Edit Motorway"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Services"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Scale"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "bad"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Presets"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Clothes"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Bike Dealer"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Edit Bicycle Shop"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25630,5 +26253,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25636,5 +26259,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -25642,5 +26265,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -25648,5 +26271,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -25654,5 +26277,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -25661,5 +26284,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -25667,5 +26290,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -25674,5 +26297,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -25684,5 +26307,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -25690,10 +26313,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -25702,10 +26325,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -25714,5 +26337,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -25721,5 +26344,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -25727,5 +26350,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -25735,13 +26358,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Shelter"
@@ -25749,19 +26371,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Bench"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Tactile Paving"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -25769,5 +26391,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -25775,5 +26397,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -25781,10 +26403,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Airport"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Airport Ground"
@@ -25792,5 +26414,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Edit Airport Ground"
@@ -25798,10 +26420,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25810,5 +26432,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Runway"
@@ -25816,5 +26438,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Edit Runway"
@@ -25822,5 +26444,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Taxiway"
@@ -25828,5 +26450,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Edit Taxiway"
@@ -25834,5 +26456,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Helipad"
@@ -25840,5 +26462,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Edit Helipad"
@@ -25848,5 +26470,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Apron"
@@ -25856,5 +26478,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25865,6 +26487,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Beacon"
@@ -25874,5 +26496,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Windsock"
@@ -25881,5 +26503,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -25887,5 +26509,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Edit Terminal"
@@ -25893,15 +26515,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Edit Terminal Gate"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Travel"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -25913,5 +26535,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25920,5 +26542,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
@@ -25931,8 +26553,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stars"
@@ -25956,34 +26578,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25997,168 +26619,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Phone Number"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26166,20 +26693,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Chalet"
@@ -26187,10 +26714,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Hostel"
@@ -26198,30 +26725,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -26229,10 +26757,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -26243,5 +26771,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26249,5 +26777,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -26255,5 +26783,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -26261,79 +26791,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -26341,18 +26871,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "chicken"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26360,10 +26890,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Cafe"
@@ -26371,10 +26901,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -26382,20 +26917,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -26403,10 +26938,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -26414,25 +26949,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -26440,9 +26975,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -26451,9 +26986,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Theme Park"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Edit Theme Park"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Artwork"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Edit Artwork"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -26461,50 +27017,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Theme Park"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Edit Theme Park"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Artwork"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Edit Artwork"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Edit Shelter"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Fireplace"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Picnic Site"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Edit Picnic Site"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topo"
@@ -26542,5 +27099,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26548,28 +27105,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -26579,5 +27136,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -26585,5 +27142,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Hiking"
@@ -26591,6 +27148,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cycling"
@@ -26598,5 +27155,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -26604,6 +27161,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skiing"
@@ -26611,5 +27168,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Riding"
@@ -26617,46 +27174,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26665,5 +27222,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -26671,55 +27228,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Edit Shelter"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Fireplace"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Picnic Site"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Edit Picnic Site"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Castle"
@@ -26728,19 +27264,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -26749,9 +27285,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -26759,10 +27295,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -26770,5 +27306,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -26776,15 +27312,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Memorial"
@@ -26792,55 +27328,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Playground"
@@ -26848,35 +27384,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -26890,6 +27426,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "select sport:"
@@ -27305,6 +27841,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27339,240 +27875,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -27589,5 +28125,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27614,23 +28149,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "type"
@@ -27647,5 +28190,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27672,211 +28214,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motor Sports"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Edit Motor Sports"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -27884,52 +28429,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Shooting"
@@ -27937,204 +28482,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motor Sports"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Edit Motor Sports"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Warning"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Edit Parking"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Motorcar"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Edit Motor Sports"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Edit Skating"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Edit Border Control point"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Car"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Edit Cable Car"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Building"
@@ -28142,5 +28753,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Public Building"
@@ -28148,10 +28759,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Town hall"
@@ -28159,10 +28770,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Embassy"
@@ -28170,10 +28781,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -28182,10 +28793,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Prison"
@@ -28194,10 +28805,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Police"
@@ -28207,10 +28818,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -28219,10 +28830,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Post Office"
@@ -28230,5 +28841,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -28236,15 +28847,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "School"
@@ -28252,10 +28863,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "University"
@@ -28263,10 +28874,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "College"
@@ -28274,5 +28885,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Edit College"
@@ -28280,5 +28891,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cinema"
@@ -28287,10 +28898,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Library"
@@ -28299,9 +28910,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -28309,10 +28920,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Theatre"
@@ -28321,10 +28932,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -28334,5 +28945,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -28341,6 +28952,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -28349,66 +28960,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Denomination"
@@ -28417,189 +29028,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunni"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Addresses"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Edit Address Information"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "House number"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "House name"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Street name"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "City name"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Post code"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Country code"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Edit Address Interpolation"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Numbering scheme"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "odd"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "even"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alphabetic"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -28607,25 +29148,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -28633,10 +29174,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Windmill"
@@ -28644,10 +29185,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28656,41 +29197,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -28700,10 +29241,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Crane"
@@ -28711,5 +29252,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -28717,10 +29258,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -28728,10 +29269,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28739,23 +29280,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -28765,35 +29306,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Power Station"
@@ -28802,10 +29343,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -28814,5 +29355,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -28820,10 +29361,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -28834,23 +29375,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Power Line"
@@ -28859,20 +29400,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28880,55 +29421,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telephone"
@@ -28937,5 +29478,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -28943,5 +29484,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Coins"
@@ -28949,5 +29490,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Notes"
@@ -28955,5 +29496,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -28961,5 +29502,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -28967,15 +29508,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recycling"
@@ -28984,5 +29525,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -28990,35 +29531,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Cans"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Clothes"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -29026,5 +29562,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -29033,31 +29569,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "brown"
@@ -29136,5 +29672,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29144,31 +29680,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -29176,31 +29712,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fountain"
@@ -29209,10 +29745,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -29221,10 +29757,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -29233,5 +29769,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -29239,501 +29775,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Foot"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Edit Supermarket"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Convenience Store"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Edit Convenience Store"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Edit Kiosk"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Butcher"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Edit Butcher"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Baker"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Edit Baker"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Organic"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Edit Organic Shop"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alcohol"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Edit Alcohol Shop"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Beverages"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Edit Beverages Shop"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Shops"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Chemist"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Edit Chemist"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Hairdresser"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Edit Hairdresser"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optician"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Edit Optician"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Edit Computer Shop"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Shoes"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Edit Shoe Shop"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Outdoor"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Edit Outdoor Shop"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Edit Sports Shop"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Dry Cleaning"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Edit Dry Cleaning"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Laundry"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Edit Laundry"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "railover"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Edit Railway"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Edit Computer Shop"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Electronics"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Edit Electronics Shop"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Edit Hifi Shop"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Edit Video Shop"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Florist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Edit Florist"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Garden Centre"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Edit Garden Centre"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Hardware"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Edit Hardware Store"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Do-it-yourself-store"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Edit Do-it-yourself-store"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Furniture"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Edit Furniture Shop"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Stationery"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Edit Stationery Shop"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Book Store"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Edit Book Store"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Travel Agency"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Edit Travel Agency"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Toys"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Edit Toy Shop"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Vending machine"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Edit Vending machine"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Vending products"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "public_transport_tickets"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "public_transport_plans"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "parking_tickets"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "food"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "drinks"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "sweets"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigarettes"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "photos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "animal_food"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "news_papers"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "toys"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "stamps"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-cards"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telephone_vouchers"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "vouchers"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "condoms"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampons"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "excrement_bags"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Account or loyalty cards"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Cash"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Bank"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Edit Bank"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Automated Teller Machine"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Money Exchange"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Edit Money Exchange"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Edit Automated Teller Machine"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Health"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Doctors"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Edit Doctors"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dentist"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Edit Dentist"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Pharmacy"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Edit Pharmacy"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Dispensing"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hospital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Edit Hospital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Shops"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Car Dealer"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Edit Car Shop"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Bike Dealer"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Edit Bicycle Shop"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Edit Supermarket"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Chemist"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Edit Chemist"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Convenience Store"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Edit Convenience Store"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Edit Kiosk"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Book Store"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Edit Book Store"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Travel Agency"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Edit Travel Agency"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Butcher"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Edit Butcher"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Baker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Edit Baker"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Florist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Edit Florist"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Organic"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Edit Organic Shop"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alcohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Edit Alcohol Shop"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Beverages"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Edit Beverages Shop"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Edit Computer Shop"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Electronics"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Edit Electronics Shop"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Edit Hifi Shop"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Furniture"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Edit Furniture Shop"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Garden Centre"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Edit Garden Centre"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Hardware"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Edit Hardware Store"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Do-it-yourself-store"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Edit Do-it-yourself-store"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Stationery"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Edit Stationery Shop"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Hairdresser"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Edit Hairdresser"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Shoes"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Edit Shoe Shop"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Toys"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Edit Toy Shop"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Edit Video Shop"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Dry Cleaning"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Edit Dry Cleaning"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Laundry"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Edit Laundry"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Outdoor"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Edit Outdoor Shop"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Edit Sports Shop"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optician"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Edit Optician"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Vending machine"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Edit Vending machine"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Vending products"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "public_transport_tickets"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "public_transport_plans"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "parking_tickets"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "food"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "drinks"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "sweets"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigarettes"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "photos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "animal_food"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "news_papers"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "toys"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "stamps"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-cards"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telephone_vouchers"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "vouchers"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "condoms"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampons"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "excrement_bags"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Account or loyalty cards"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Cash"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Bank"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Edit Bank"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Automated Teller Machine"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Money Exchange"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Edit Money Exchange"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Edit Automated Teller Machine"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Health"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Doctors"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Edit Doctors"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dentist"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Edit Dentist"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Pharmacy"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Edit Pharmacy"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Dispensing"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hospital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Edit Hospital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -29742,5 +30280,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -29749,15 +30287,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -29765,5 +30303,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -29772,368 +30310,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Boundaries"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "National"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Edit National Boundary"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrative"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Edit Administrative Boundary"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Edit Civil Boundary"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Political"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Edit Political Boundary"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "National park"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Edit National Park Boundary"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Places"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Country"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Edit Country"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "State"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Edit State"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Edit Region"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "County"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Edit County"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "City"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Edit City"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Town"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Edit Town"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Suburb"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Village"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Edit Village"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Hamlet"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Locality"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Peak"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Edit Peak"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glacier"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Edit Glacier"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Volcano"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Edit Volcano"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Cave Entrance"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Edit Cave Entrance"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Island"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Edit Island"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Islet"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Edit Islet"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "nature"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Tree"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Edit Tree"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanical Name"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Wood"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Edit Wood"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "coniferous"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "deciduous"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "mixed"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Forest"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Edit Forest Landuse"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Nature Reserve"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Edit Nature Reserve"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Cave Entrance"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Edit Cave Entrance"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Peak"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Edit Peak"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glacier"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Edit Glacier"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Volcano"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Edit Volcano"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Boundaries"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "National"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Edit National Boundary"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrative"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Edit Administrative Boundary"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Edit Civil Boundary"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Political"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Edit Political Boundary"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "National park"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Edit National Park Boundary"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Scree"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Edit Scree"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Fell"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Edit Fell"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Scrub"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Edit Scrub"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Heath"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Edit Heath"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Tree"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Edit Tree"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanical Name"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Wood"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Edit Wood"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "coniferous"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "deciduous"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "mixed"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Forest"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Edit Forest Landuse"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Nature Reserve"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Edit Nature Reserve"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Scree"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Edit Scree"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Scrub"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Edit Scrub"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Fell"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Edit Fell"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Heath"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Edit Heath"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -30142,45 +30686,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -30188,25 +30732,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Village Green"
@@ -30214,10 +30758,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Common"
@@ -30225,20 +30769,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -30246,5 +30790,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -30252,15 +30796,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -30268,9 +30812,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -30278,39 +30822,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Railway land"
@@ -30318,15 +30862,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -30334,52 +30878,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Station"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Addresses"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Edit Address Information"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "House number"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "House name"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Street name"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "City name"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Post code"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Country code"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Edit Address Interpolation"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Numbering scheme"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "odd"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "even"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alphabetic"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Content"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Add author information"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Image"
 
 #. item "Relations/Multipolygon"
@@ -30387,5 +31064,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -30397,5 +31074,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "outer segment"
@@ -30403,5 +31080,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "inner segment"
@@ -30409,5 +31086,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -30418,5 +31095,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -30424,36 +31101,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -30461,5 +31138,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -30468,5 +31145,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -30474,34 +31151,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -30510,15 +31187,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "to way"
@@ -30526,5 +31203,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Route"
@@ -30533,5 +31210,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -30539,132 +31216,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Route type"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicycle"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -30732,5 +31298,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30740,9 +31306,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "detour"
@@ -30756,10 +31322,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -30767,31 +31333,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -30800,30 +31366,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -34801,7 +35367,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34923,9 +35488,15 @@
 msgstr "Sicily - Italy"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
 
+#~ msgid "Keep backup files"
+#~ msgstr "Keep backup files"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Waterway Point"
+
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -34999,7 +35570,4 @@
 #~ 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)"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 22859)
+++ applications/editors/josm/i18n/po/es.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-20 11:20+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-29 03:56+0000\n"
 "Last-Translator: IgorTamara <igor@tamarapatino.org>\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-08-20 19:13+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Atención"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Editor Java de OpenStreetMap"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -255,5 +255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -280,5 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -303,5 +303,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -411,4 +411,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -426,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1060,5 +1061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1067,5 +1068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1078,5 +1079,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1488,13 +1489,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "Limpiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr "Confirmar limpieza"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1506,5 +1507,5 @@
 "de datos al servidor"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1514,9 +1515,9 @@
 "elementos seleccionados:"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Añadir a selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1526,5 +1527,5 @@
 "cambios.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Limpiar buffer de deshacer/rehacer"
@@ -1558,8 +1559,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1568,9 +1569,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1586,6 +1587,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1595,5 +1596,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1618,6 +1619,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Error"
@@ -1780,5 +1781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "No, abortar"
@@ -2066,5 +2067,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2557,5 +2558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2599,10 +2600,10 @@
 "¿Desea desplazarlos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 "Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2611,9 +2612,9 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2901,5 +2902,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Buscar"
@@ -3110,7 +3111,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3384,5 +3385,5 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3541,6 +3542,6 @@
 msgstr "Correción automática de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
@@ -3548,20 +3549,20 @@
 "No se puede crear el directorio {0}. Se deshabilitará el guardado automático."
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "Imposible crear el archivo {0}, se utilizará otro nombre de archivo"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "IOError creando el archivo. No se guardará automáticamente: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "No se pudo borrar el anterior archivo de copia de seguridad {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
@@ -3569,5 +3570,5 @@
 "Se produjo un error al crear la copia de seguridad de la capa eliminada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3586,15 +3587,15 @@
 msgstr "Valor de longitud ilegal \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Archivo de configuración malformado en las lineas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3605,5 +3606,5 @@
 "preferencias ''{0}'' no es un directorio."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3614,5 +3615,5 @@
 "preferencias ''{0}'' no es un directorio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3623,5 +3624,5 @@
 "de preferencias desaparecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3632,5 +3633,5 @@
 "directorio de preferencias desaparecido: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3640,5 +3641,5 @@
 "preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3649,5 +3650,5 @@
 "archivo por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3658,5 +3659,5 @@
 "archivo de preferencias por defecto:{0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3668,5 +3669,5 @@
 "defecto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3677,10 +3678,10 @@
 "de preferencias por defecto. {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3811,5 +3812,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3894,9 +3895,9 @@
 "changesetId es {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3906,5 +3907,5 @@
 "es nueva y la otra no."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4102,15 +4103,34 @@
 msgstr "PUWG 2000 zona {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Rejilla suiza (Suiza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Zona UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Norte"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "sur"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Ir allí"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4134,9 +4154,9 @@
 msgstr "Guyana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM Francia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "Sistema geodésico UTM"
@@ -4181,5 +4201,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "ferrocarril"
@@ -4200,5 +4220,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4454,70 +4474,70 @@
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 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:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar datos GPS desde URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Definir idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4531,9 +4551,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4543,59 +4563,69 @@
 "esta orden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Hay que cargar algún dato si se usa --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Inicializar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Actualizando complementos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Instalando complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Datos OSM sin guardar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Restaurar"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "Tarjetas de débito"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM encontró {0} capas de datos OSM sin guardar. Parece que la ultima vez "
 "que se utilizó JOSM este se colgó. ¿Desea restaurar lo datos?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4608,9 +4638,9 @@
 "(compatible con Java 5) de JOSM.</li></ul>Más información:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "Salir de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Continuar, intentar de todas formas"
@@ -4624,9 +4654,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4751,23 +4782,23 @@
 msgstr "Usuario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' debe estar en la lista de capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Imperial"
@@ -4870,5 +4901,5 @@
 "objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4878,17 +4909,17 @@
 "zoom dado.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Nivel de zoom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "desde la tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "hasta la tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4902,25 +4933,25 @@
 "<i>zoom;x;y</i> también son válidas.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Dirección de la tesela:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Aplicar la dirección de la tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Por favor, introduzca la dirección de la tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "El valor actual no es una dirección de tesela válida."
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Introduzca un índice de tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5358,4 +5389,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5441,4 +5473,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5455,4 +5488,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5531,5 +5565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5541,10 +5575,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ninguno"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "todos"
@@ -5572,4 +5606,5 @@
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
 msgstr ""
+"Todos los valores unidos como \"{0}\" serán aplicados a la llave \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
@@ -5626,5 +5661,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5636,5 +5671,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5670,17 +5705,17 @@
 msgstr "Aún no decidido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Función:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Introduzca un rol para todos los miembros de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Etiquetar las relaciones modificadas con "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5690,10 +5725,10 @@
 "<br>todas las relaciones modificadas.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
@@ -5702,5 +5737,5 @@
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5708,5 +5743,5 @@
 msgstr "Valor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5715,5 +5750,5 @@
 "miembros</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5731,5 +5766,5 @@
 "de la primera vía.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5747,5 +5782,5 @@
 "lugar del nodo original en la relación.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Aplicar esta función a todos los miembros"
@@ -5900,5 +5935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -6018,5 +6053,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -6024,5 +6059,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -6030,5 +6065,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -6036,5 +6071,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -6042,5 +6077,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -6049,5 +6084,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6055,5 +6090,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6061,5 +6096,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6067,24 +6102,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos ocultos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6106,5 +6141,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6130,37 +6165,37 @@
 msgstr "Información ampliada sobre el objeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Introduzca las coordenadas para el nuevo nodo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Usar grados decimales."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos denotan hemisferio Oeste/Sur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Por favor, introduce una latitud válida en el rango -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Por favor, una latitud válida en el rango -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Por favor, introduce una latitud válida en el rango-180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Introduzca una longitud en el rango -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Cerrar el diálogo y crear un nuevo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Cerrar el diálogo, no crear un nuevo nodo"
@@ -6216,9 +6251,9 @@
 msgstr "Información de capa"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relaciones"
@@ -6266,10 +6301,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Descargar miembros incompletos de las relaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Descargar miembros incompletos"
@@ -6289,37 +6324,37 @@
 msgstr "Abrir una ventana de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Búsqueda de objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoom a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zoom a los elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Llame al editor para relacionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Llame al editor de relaciones para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Seleccionar en la lista de relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Seleccionar relación en la lista de relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6328,28 +6363,28 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 "Obtenga información detallada en el estado interno de los objetos.<html"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Inspeccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6358,5 +6393,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -6650,13 +6685,13 @@
 msgstr "Nada para ampliar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "No se ha descargado el contenido de esta modificación."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Descargar ahora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Descarga el contenido de la modificación"
@@ -6768,4 +6803,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6784,6 +6823,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6801,8 +6838,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6813,4 +6857,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6825,33 +6875,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6875,12 +6914,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6952,10 +7001,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6985,8 +7038,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -7049,6 +7098,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7101,4 +7148,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7163,32 +7222,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7197,6 +7264,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7205,24 +7274,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7237,82 +7296,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7393,155 +7452,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nombre"
@@ -8020,4 +8084,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<diferente>"
@@ -8567,17 +8632,17 @@
 "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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "incluido los hijos inmediatos de las relaciones padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Cargar relaciones padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Cargando relaciones padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Editar la relación seleccionada"
@@ -8867,4 +8932,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8872,15 +8938,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Tipo"
@@ -8899,16 +8965,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "desconocido"
@@ -9554,5 +9620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Lanza un diálogo para seleccionar un archivo"
@@ -9800,20 +9866,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Capa"
@@ -9917,9 +9983,9 @@
 "El comentario para los datos que va a subir es <i>inexistente</i> o <i>muy "
 "corto</i>.<br /><br /> Esto técnicamente está permitido pero, por favor, "
-"considere que puede que otros usuarios<br /> estén vigilando las ediciones "
+"considere que puede que otros usuarios estén vigilando<br /> las ediciones "
 "que se realizan en este área y ellos dependen de los comentarios precisos "
-"que se realicen a los conjuntos de cambios<br /> para comprender lo que está "
+"que se realicen a los conjuntos de cambios para comprender lo que está "
 "pasando.<br /><br /> Si emplea un minuto para explicar su edición hará la "
-"vida<br /> más sencilla a otros colaboradores de OSM."
+"vida más sencilla a otros colaboradores de OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
@@ -10319,5 +10385,63 @@
 msgstr[1] "{0} objetos para eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Descripción: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} traza"
+msgstr[1] "{0} trazas"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Descripción"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Intervalo de tiempo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Longitud"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} nodo de vía"
+msgstr[1] "{0} nodos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10325,75 +10449,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Nombre: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Descripción: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} traza"
 msgstr[1] "{0} trazas"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Descripción"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Intervalo de tiempo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Longitud"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Longitud: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} nodo de vía"
-msgstr[1] "{0} nodos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:"
 msgstr ""
-"<html>La subida de datos gps sin procesar como datos de mapa se considera "
-"peligroso.<br>Si quiere subir trazas, consulte aquí:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+"<html>La subida de datos GPS sin procesar directamente como elementos del "
+"mapa se considera peligroso.<br>Si quiere subir sus trazas, consulte aquí:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10404,7 +10483,7 @@
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10412,10 +10491,10 @@
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10423,10 +10502,10 @@
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10434,21 +10513,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Descargar cercanos:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "Solamente trazas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "Solamente puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "trazas y puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10460,9 +10539,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10473,5 +10552,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10481,30 +10560,30 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar líneas entre puntos para esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar líneas entre puntos para esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10512,5 +10591,5 @@
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10519,5 +10598,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10526,18 +10605,18 @@
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10550,23 +10629,23 @@
 "correlacionar con datos de audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "No es posible importar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -11026,15 +11105,15 @@
 msgstr "El archivo de imagen no se pudo borrar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Ninguna imagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Cargando {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -12106,4 +12185,48 @@
 msgid "Voice recorder calibration"
 msgstr "Calibración del grabador de voz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Intervalo de actualización (en días):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "El valor por defecto es ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Al guardar, conserve los archivos de backup que terminen en ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Archivo de respaldo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Configurar si desea crear archivos de copia de seguridad"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12189,5 +12312,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Coche"
@@ -12206,16 +12329,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -12249,12 +12372,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Pie"
@@ -12521,18 +12644,18 @@
 msgstr "Por defecto (determinado automáticamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Activar los valores predefinidos por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Activar los iconos predefinidos por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Estilo usado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Estilos de semiología cartográfica"
@@ -12880,27 +13003,19 @@
 msgstr "No se ha podido activar la proyección {0}. Usando Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Configuraciones de proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Archivo de respaldo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "Configure su identidad y cómo se autentica al servidor OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 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 "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
@@ -13018,6 +13133,15 @@
 "<br><br>Detalles(sin traducir)<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "Herramientas externas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13068,4 +13192,7 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
+"<html>La fuente predeterminada de etiquetas {0} puede descargarse pero "
+"contiene errores. ¿Realmente desea usarla?<br><br><table width=600>El error "
+"es: {1}</table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
@@ -13075,4 +13202,7 @@
 "it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
+"<html>No se puede interpretar la fuente predeterminada de etiquetas: {0}."
+"¿Realmente desea usarla?<br><br><table width=600>El error es: {1}</table></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
@@ -13264,12 +13394,4 @@
 "Usando el método de autenticación \"Autenticación Básica\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Conservar archivos de copia de seguridad"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Al guardar, conserve los archivos de backup que terminen en ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13304,17 +13426,23 @@
 #, java-format
 msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+msgstr "El administrador de credenciales actual es \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
 msgid "Warning: failed to save OSM credentials to credential manager."
 msgstr ""
+"Advertencia: fallo el guardar las credecniales OSM al administrador de "
+"credenciales"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
 msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
+"Advertencia: Fallo al descargar Llave de Acceso OAuth del administrador de "
+"credenciales"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
 msgid "Warning: Failed to store OAuth Access Token to credentials manager"
 msgstr ""
+"Advertencia: Fallo al almacenar Llave de Acceso OAuth al administrador de "
+"credenciales"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
@@ -13323,20 +13451,23 @@
 "Please authorize first."
 msgstr ""
+"No tiene acceso a la llave de Acceso para acceder al servidor OSM usando "
+"OAuth. Por favor autorícelo primero."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
 msgid "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
+"Usted ya tiene una llave de Acceso para acceder al servidor OSM usando OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
 msgid "Save to preferences"
-msgstr ""
+msgstr "Guardar preferencias"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
 msgid "Click to step through the OAuth authorization process"
-msgstr ""
+msgstr "Seleccione para salir del proceso de autorización OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
 msgid "New Access Token"
-msgstr ""
+msgstr "Nueva llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:332
@@ -13345,8 +13476,10 @@
 "Access Token"
 msgstr ""
+"Seleccione para ingresar al proceso de autorización OAuth y generar una "
+"nueva llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:357
 msgid "Click test access to the OSM server with the current access token"
-msgstr ""
+msgstr "Seleecione probar acceso al servidor OSM con la llave de Acceso actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
@@ -13366,25 +13499,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:153
 msgid "Test the API URL"
-msgstr ""
+msgstr "Probar la URL de API"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:169
 msgid "The API URL is valid."
-msgstr ""
+msgstr "La URL del API es válida"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
 msgid "Validation failed. The API URL seems to be invalid."
-msgstr ""
+msgstr "Falló la validación. La URL parece no válida."
 
 #: ../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 ""
+"La URL del API OSM no puede ser vacía. Por favor ingrese una URL de API OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
 msgid "The current value is not a valid URL"
-msgstr ""
+msgstr "El valor actual no es una URL válida"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:241
 msgid "Please enter the OSM API URL."
-msgstr ""
+msgstr "Por favor ingrese el URL del API OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
@@ -13416,5 +13550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:242
 msgid "Use standard system settings"
-msgstr ""
+msgstr "Usar las opciones de estándar sistema"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
@@ -13423,4 +13557,6 @@
 "useSystemProxies=true</tt> to enable)"
 msgstr ""
+"Usar las opciones estándar del sistema(deshabilitado. Para habilitarlo, "
+"lance JOSM con <tt>-Djava.net.useSystemProxies=true</tt>)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -13444,5 +13580,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:64
 msgid "multiple"
-msgstr ""
+msgstr "múltiple"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:500
@@ -13461,5 +13597,5 @@
 msgstr "Añadir una nueva etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13468,49 +13604,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+msgstr "Requisito desconocido: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Roles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+msgstr "rol"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+msgstr "conteo"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
-msgstr ""
+msgstr "elementos"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+msgstr "Rol preestablecido sin padre"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+msgstr "subelmento preestablecido sin padre"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13520,15 +13656,15 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13538,17 +13674,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13571,5 +13707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Mostrar diálogo de búsqueda preestablecida"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
@@ -13606,4 +13742,6 @@
 "a bounding box)"
 msgstr ""
+"URL de www.openstreetmap.org (Puede pegar un una URL de descarga para "
+"especificar una región)"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
@@ -13611,4 +13749,5 @@
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
 msgstr ""
+"El OSM ID actual no es válido. Por favor ingrese un entero mayor que cero"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -13636,4 +13775,6 @@
 "capabilities. Got ''{2}''"
 msgstr ""
+"Advertencia: valor ilegal \"{1}\" para el atributo \"{0}\" en las "
+"capacidades del servidor. Se obtuvo \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -13641,5 +13782,5 @@
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
-msgstr ""
+msgstr "Fallo al verificar la fecha \"{0}\" respondida por el servidor."
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
@@ -13649,4 +13790,6 @@
 "''{0}''"
 msgstr ""
+"Formato inestperado del encabezado de error para el conflicto en la "
+"actualización del conjunto de cambios. Se obtuvo \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
@@ -13656,4 +13799,5 @@
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"La longitud es ilegal como valor para el parámetro \"{0}\", se obtuvo {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
@@ -13661,4 +13805,5 @@
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"La Latitud es ilegal como valor para el parámetro \"{0}\", se obtuvo {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
@@ -13675,4 +13820,6 @@
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
+"Valor inesperado para \"{0}\" en la url de consulta del conjunto de cambios, "
+"se obtuvo {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -13682,4 +13829,6 @@
 "and ''display_name''"
 msgstr ""
+"No se puede crear una consulta de conjunto de cambios incluyendo los "
+"parámetros \"uid\" y \"display_name\""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
@@ -13687,4 +13836,5 @@
 msgid "Unsupported parameter ''{0}'' in changeset query string"
 msgstr ""
+"El parámetro \"{0}\" no es soportado en la consulta del conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
@@ -13693,4 +13843,6 @@
 "Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
 msgstr ""
+"Formato inesperado para el número de puerto en la preferencia \"{0}\". Se "
+"obtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
@@ -13700,15 +13852,15 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
 msgid "The proxy will not be used."
-msgstr ""
+msgstr "No se usará el proxy"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
 #, java-format
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
+msgstr "Puerto ilegal en la preferencia \"{0}\". Se obtuvo {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
 #, java-format
 msgid "Warning: no preference ''{0}'' found."
-msgstr ""
+msgstr "Advertencia: No se encontró la preferencia \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
@@ -13718,4 +13870,6 @@
 "use no proxy."
 msgstr ""
+"Advertencia: valor inesperado para la preferencia \"{0}\". Se obtuvo \"{1}"
+"\". No se usará proxy"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
@@ -13725,4 +13879,6 @@
 "''{1}''."
 msgstr ""
+"Advertencia: Parámetros inesperados para el proxy HTTP. Se obtuvo el "
+"servidor \"{0}\" y el puerto \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
@@ -13732,4 +13888,6 @@
 "''{1}''."
 msgstr ""
+"Advertencia: Parámetros inesperados para el proxy SOCKS. Se obtuvo el "
+"servidor \"{0}\" y el puerto \"{1}\"."
 
 #. Just log something. The network stack will also throw an exception which will be caught
@@ -13741,4 +13899,6 @@
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
 msgstr ""
+"Error: Falló la conexión al proxy \"{0}\" para la URI \"{1}\". La excepción "
+"fue: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
@@ -13748,27 +13908,30 @@
 "time.  Will not use a proxy."
 msgstr ""
+"Advertencia: La JVM no está configurada para encontrar proxys de las "
+"opciones del sistema.  La propiedad ''java.net.useSystemProxies'' no estaba "
+"presente cuando inició el programa. No se usará proxy."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
 msgid "Parsing response from server..."
-msgstr ""
+msgstr "Revisando respuesta del servidor..."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Elemento con nombre \"{0}\" inesperado"
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
 msgid "Could not export ''{0}''."
-msgstr ""
+msgstr "No se pudo exportar \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
 #, java-format
 msgid "Could not import ''{0}''."
-msgstr ""
+msgstr "No se pudo importar \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
 msgid "Could not import files."
-msgstr ""
+msgstr "No se pudo importar archivos."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
@@ -13776,9 +13939,10 @@
 msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
 msgstr ""
+"<html>No se pudo leer el fichero \"{0}\".<br>El error es:<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
 #, java-format
 msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
-msgstr ""
+msgstr "<html>No se pudo leer los archivos.<br>El error es:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
@@ -13864,4 +14028,6 @@
 "available"
 msgstr ""
+"Ocurrió un error al interpretar el fichero gpx {0}. Sólo parte del fichero "
+"estará disponible"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -13889,5 +14055,5 @@
 #, java-format
 msgid "Unknown mode {0}."
-msgstr ""
+msgstr "Modo desconocido {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
@@ -13901,14 +14067,14 @@
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
 msgid "Looking for image files"
-msgstr ""
+msgstr "Buscando archivos de imágenes"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
-msgstr ""
+msgstr "No se encontraron archivos de imágenes"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "Fallo al abrir canal de lectura para el recurso \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105
@@ -13918,4 +14084,6 @@
 "zip file ''{0}''. Exception was: {1}"
 msgstr ""
+"Advertencia: fallo al abrir fichero con extensión \"{2}\" y porción \"{3}\" "
+"en el fichero zip \"{0}\". La excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -13923,4 +14091,6 @@
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
+"No hay primitiva con el id {0} en el conjunto local de datos. No se puede "
+"inferir el tipo de primitiva."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -13951,5 +14121,5 @@
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "El servidor respondió con código 404 para el id {0}. Omitiéndolo."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
@@ -13980,6 +14150,6 @@
 msgid "Downloading {0} object from ''{1}''"
 msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Descargando {0} objeto de \"{1}\""
+msgstr[1] "Descargando {0} objetos de \"{1}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
@@ -14019,5 +14189,5 @@
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
-msgstr ""
+msgstr "Falta la preferencia \"{0}\". No puede inicializarse OsmApi"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
@@ -14031,4 +14201,6 @@
 "{1}."
 msgstr ""
+"se soporta la versión 0.6, mientras que el servidor dice que soporta {0} a "
+"{1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
@@ -14042,4 +14214,5 @@
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
+"Formato de ID inesperado respondido por el servidor. Se obtuvo \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
@@ -14048,4 +14221,6 @@
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
+"Formato inesperado de nueva versión de primitiva \"{0}\" modificada. Se "
+"obtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
@@ -14063,5 +14238,5 @@
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
-msgstr ""
+msgstr "Se esperaba un ID de Conjunto de Camibos > 0. Se obtuvo {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
@@ -14084,5 +14259,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
-msgstr ""
+msgstr "Preparando solicitud de subida..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
@@ -14106,5 +14281,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635
 msgid "Current changeset is null. Cannot upload data."
-msgstr ""
+msgstr "El conjunto de cambios actual es nulo. No se puede subir datos."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:637
@@ -14112,4 +14287,6 @@
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
+"Se requiere que el ID del conjunto de cambios actual sea > 0. El ID actual "
+"es {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:665
@@ -14117,4 +14294,6 @@
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
+"Se esperaba apertura del conjunto de cambios. Se obtuvo ciere de conjunto de "
+"cambios con id {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
@@ -14142,4 +14321,6 @@
 msgid "Prolog of OsmChange document already written. Please write only once."
 msgstr ""
+"El prólogo del documento OsmChange ya se escribió. Por favor escriba "
+"solamente una vez"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
@@ -14148,4 +14329,6 @@
 msgid "Prolog of OsmChange document not written yet. Please write frst."
 msgstr ""
+"El prólogo del documento OsmChange no se ha escrito aún. Por favor escriba "
+"uno."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -14160,5 +14343,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14195,4 +14378,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
 msgstr ""
+"El valor para el atributo obligario \"{0}\" de tipo decimal es ilegal. Se "
+"obtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
@@ -14226,4 +14411,6 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Advertencia: El elemento \"{0}\" no se acepta como comienzo en el contenido "
+"del conjunto de cambios en la posición ({1},{2}). Omitiéndolo."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -14232,4 +14419,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Estructura ilegal de documento. Se encontró un nodo, una vía o una relación "
+"por fuera de \"create\", \"modify\", o \"eliminar\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -14239,8 +14428,10 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Advertencia: no se soporta el elemento \"{0}\" al final en el conjunto de "
+"cambios en la posición ({1},{2}). Omitiéndolo."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
 msgid "Parsing changeset content ..."
-msgstr ""
+msgstr "Verificando contenido del conjunto de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:80
@@ -14251,25 +14442,25 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Valor ilegal para el atributo \"{0}\". Se obtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:83
 #, java-format
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Valor numérico ilegal para el atributo \"{0}\". Se ovtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:117
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Valor de verdad ilegal para el atributo \"{0}\". Se obtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
-msgstr ""
+msgstr "Hace falta el atributo obligatorio \"{0}\" para el elemento XML {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14281,4 +14472,6 @@
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
 msgstr ""
+"Se encontró un elemento indefinido \"{0}\"  en el canal de lectura. "
+"Abortando."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:218
@@ -14289,4 +14482,5 @@
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
+"Fallo al firmar una conexión HTTP con el encabezado de autenticación OAuth"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
@@ -14294,4 +14488,5 @@
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
 msgstr ""
+"Advertencia: valor inesperado para la preferencia \"{0}\". Se obtuvo \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
@@ -14300,5 +14495,5 @@
 #, java-format
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(en la línea {0}, columna {1})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -14310,5 +14505,5 @@
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
-msgstr ""
+msgstr "<html>Ocurrió un error al guardar.<br>El error es:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104
@@ -14318,9 +14513,11 @@
 "html>"
 msgstr ""
+"<html>Un error ocurrió cuando se restablecía archivo de respaldo.<br>El "
+"error es:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
+msgstr "No se pudo hacer copia de seguridad. La excepcińo fue: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
@@ -14338,5 +14535,5 @@
 msgstr "El archivo \"{0} no existe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14345,17 +14542,21 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+"Hace falta atributos obligatorios en el elemento \"bounds\". Se obtuvo "
+"minlon=\"{0}\", minlat=\"{1}\", maxlon=\"{3}\", maxlat=\"{4}\", origin=\"{5}"
+"\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+"Se encontró elemento XML <nd> como un hijo no directo del elemento <way>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+msgstr "Hace falta un aributo obligatorio \"{0}\" en <nd> de la vía {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14363,34 +14564,38 @@
 msgstr "Valor ilegal del atributo \"ref\" del elemento <nd>. Es  {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
 msgid "Deleted way {0} contains nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+msgstr "La vía borrada {0} contiene nodos"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+"Se encontró el elemento XML <member> como hijo no directo del elemento "
+"<relation>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+msgstr "Falta el atributo \"ref\" en el miembro de la relación {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+"Valor ilegal del atributo \"ref\" en el miembro de la relación {0}. Se "
+"obtuvo {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+msgstr "Hace falta el atributo \"type\" en el miembro {0} de la relación {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14398,33 +14603,37 @@
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+"Valor ilegal para el atributo \"tipo\" del  miembro {0} en la relación {1}. "
+"Se obtuvo {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
 msgid "Deleted relation {0} contains members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+msgstr "La relación borrada {0} contiene miembros"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+msgstr "Hace falta lla llave o el valor del atributo en la característica(tag)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+"Se encontró el elemento \"{0}\" no definido en el canal de entrada. "
+"Omitiéndolo."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14434,10 +14643,12 @@
 "{1}."
 msgstr ""
+"Valor ilegal para el atributo \"version\" en la primitiva OSM con ID {0}. Se "
+"obtuvo {1}."
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14449,7 +14660,9 @@
 "API version is ''{3}''. Got {1}."
 msgstr ""
+"ADVERTENCIA: Normalizando el valor del atributo \"version\" del elemento {0} "
+"a {2}, la versión de la API es \"{3}\". Se obtuvo {1}."
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14457,13 +14670,13 @@
 msgstr "Versión del API desconocida o no soportada. Es {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr ""
+msgstr "Falta el atributo \"version\" en la primitiva OSM con ID {0}."
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14473,40 +14686,45 @@
 "Resetting to 0."
 msgstr ""
+"Valor ilegal para el atributo \"changeset\" del nuevo objeto {1}. Se obtuvo "
+"{0}. Volviendo a 0."
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+msgstr "Valor ilegal para el atributo \"changeset\". Se obtuvo {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+msgstr "Hace falta el atributo obligatorio \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
+"Hay un valor ilegal número(long) para el atributo \"{0}\". Se obtuvo \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"La vía con ID externo \"{0}\" incluye un nodo faltante con ID externo \"{1}"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
 msgid "Deleted node {0} is part of way {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+msgstr "El nodo borrado {0} hace parte de la vía {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14515,6 +14733,8 @@
 "missing in the loaded data."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+"La vía {0} con {1} nodos tiene nodos incompletos porque hace falta por lo "
+"menos un nodo en los datos cargados."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14523,27 +14743,29 @@
 "external id ''{1}''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+"La relación con id externo \"{0}\" se refiere a una primitiva con id externo "
+"\"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
 msgid "Deleted member {0} is used by relation {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+msgstr "El miembro eliminado {0} se usa en la relación {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Analizando los datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Preparando conjunto de datos..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
-msgstr ""
+msgstr "Línea {0} columna {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14553,5 +14775,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Descargamdp vías referenciadas..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
@@ -14592,5 +14814,5 @@
 #, java-format
 msgid "Downloading content for changeset {0} ..."
-msgstr ""
+msgstr "Descargando contenidos del conjunto de cambios {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
@@ -14638,5 +14860,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
 msgid "Reading user info ..."
-msgstr ""
+msgstr "Leyendo información del usuario ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
@@ -14666,9 +14888,9 @@
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Se esperaba un valor > 0 para el parámetro \"{0}\", se obtuvo {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
 msgid "Starting to upload in chunks..."
-msgstr ""
+msgstr "Comenzando a subir por porciones."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:160
@@ -14685,5 +14907,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "Se encontró un id 0 inesperado para la primitiva osm"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
@@ -14706,5 +14928,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "Se omitió la descarga"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -14714,4 +14936,6 @@
 "Skipping download."
 msgstr ""
+"Advertencia: No se puede descargar el plugin \"{0}\". Se desconoce el enlace "
+"de descarga. Omitiendo descarga."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
@@ -14721,9 +14945,11 @@
 "valid URL. Skipping download."
 msgstr ""
+"Advertencia: No se puede descargar el plugin \"{0}\". Su enlace de descarga "
+"\"{1}\" no es una URL válida. Omitiendo descarga."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
-msgstr ""
+msgstr "Fallo al crear directorio de plugins \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:175
@@ -14742,6 +14968,6 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "El siguiente plugin no se requiere más y ha sido desactivado:"
+msgstr[1] "Los siguientes plugin no se requieren más y ha sido desactivado:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
@@ -14752,4 +14978,7 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
+"<hmlt>Se solicitó la carga del plugin \"{0}\". <br>Este plugin no tiene "
+"asegurado su desarrollo y es muy probable que produzca errors.<br>Debería "
+"deshabilitarse.<br>¿Borrarlo de las preferencias?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -14768,5 +14997,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
 msgid "Click to update the activated plugins"
-msgstr ""
+msgstr "Elija para actualizar los plugins activos"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -14776,5 +15005,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
 msgid "Click to skip updating the activated plugins"
-msgstr ""
+msgstr "Elija para omitir actualización de plugins activos"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
@@ -14783,4 +15012,6 @@
 "disabled."
 msgstr ""
+"Omitir actualización de plugin después de actualización de JOSM. La "
+"actualización automática al inicio está inactiva."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
@@ -14789,4 +15020,6 @@
 "startup is disabled."
 msgstr ""
+"Omitir actualización de plugin después de un intervalo de tiempo. La "
+"actualización automática al inicio está inactiva."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
@@ -14795,4 +15028,6 @@
 "enabled."
 msgstr ""
+"Actualizar plugin después de la actualización de JOSM. La actualización "
+"automática al inicio está activada."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
@@ -14801,4 +15036,6 @@
 "startup is disabled."
 msgstr ""
+"Ejecutar actualización de plugin después de un intervalo de tiempo. La "
+"actualización automática al inicio está inactiva."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
@@ -14807,4 +15044,6 @@
 "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
 msgstr ""
+"Valor \"{0}\" inesperado para la preferencia \"{1}\". Asumiendo valor \"ask"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
@@ -14816,5 +15055,8 @@
 "are:"
 msgstr[0] ""
+"El plugin {0} requiere un plugin que no se encontró. El plugin faltante es:"
 msgstr[1] ""
+"El plugin {0} requiere {1}  plugin que no se encontraron. El plugin faltante "
+"es:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
@@ -14824,4 +15066,6 @@
 "<br>You have to update JOSM in order to use this plugin.</html>"
 msgstr ""
+"<html>El plugin {0} requiere versión {1} de JOSM. La versión actual de JOSM "
+"es {2}. <br> Requiere actualizar JOSM para poder usar tal plugin.</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -14834,5 +15078,5 @@
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
-msgstr ""
+msgstr "cargando plugin \"{0}\" (versión {1})"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
@@ -14842,4 +15086,6 @@
 "not found.<br>Delete from preferences?"
 msgstr ""
+"<html>No se pudo cargar el plugin {0} porque el plugin<br>clase principal "
+"\"{1}\" no se encontró.<br> ¿Borrar de las preferencias?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
@@ -14880,5 +15126,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
-msgstr ""
+msgstr "Removiendo plugins no mantenidos..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
@@ -14896,5 +15142,9 @@
 "them manually."
 msgstr[0] ""
+"Por favor abra el diálogo de preferencias después de iniciado JOSM e intente "
+"actualizarlo manualmente."
 msgstr[1] ""
+"Por favor abra el diálogo de preferencias después de iniciado JOSM e intente "
+"actualizarlos manualmente."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
@@ -14905,5 +15155,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
-msgstr ""
+msgstr "Advertencia: fallo al descargar lista de información de plugins"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
@@ -14916,5 +15166,5 @@
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr ""
+msgstr "Elija para borrar el plugin \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
@@ -14927,5 +15177,5 @@
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
-msgstr ""
+msgstr "Elija para mantener el plugin \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
@@ -14941,4 +15191,6 @@
 "installation. JOSM is still going to load the old plugin version."
 msgstr ""
+"Advertencia: fallo al instalar plugin previamente descargdo \"{0}\". "
+"Omitiendo instalación. JOSM cargará la versión antigua del plugin."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
@@ -14948,9 +15200,11 @@
 "''{1}''. Renaming failed."
 msgstr ""
+"Advertencia: fallo al instalar plugin \"{0}\" del fichero descargado "
+"temporalmente \"{1}\". Fallo al renombrar."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr ""
+msgstr "Elija para deshabilitar el plugin \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
@@ -15006,5 +15260,5 @@
 #, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "El archivo del plugin \"{0}\" no contiene un Manifiesto."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
@@ -15016,5 +15270,5 @@
 #, java-format
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
-msgstr ""
+msgstr "Fallo al crear información del plugin \"{0}\" a partir del manifiesto."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
@@ -15025,5 +15279,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
 msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Procesando ficheros de caché del sitio del plugin"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
@@ -15032,5 +15286,5 @@
 #, java-format
 msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Procesando fichero \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:92
@@ -15039,8 +15293,10 @@
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
+"Advertencia: Fallo al revisar el fichero \"{0}\" en búsqueda de información "
+"del plugin. Omitiéndolo"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
 msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Procesando sitio del caché de los íconos del plugin..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
@@ -15053,11 +15309,11 @@
 msgstr "Descargando lista de componentes..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Descargando lista de componentes desde ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15065,11 +15321,13 @@
 "from plugin site ''{1}''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+"Advertencia: fallo al crear directorio del plugin \"{0}\". No se puede hacer "
+"caché de la lista de plugins del sitio \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Escribiendo la lista de componentes a la caché local ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
@@ -15077,6 +15335,6 @@
 "Analizando sintáctivamente la lista de componentes desde el sitio ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15084,6 +15342,8 @@
 "Exception was: {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+"Fallo al revisar el documento la lista de plugins del sitio \"{0}\". "
+"Omitiendo sitio. La excepción fue:  {1}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15096,5 +15356,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
 msgid "unspecified reason"
-msgstr ""
+msgstr "Razón no especificada"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:348
@@ -15104,13 +15364,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "No hacer nada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Informar del error"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15118,22 +15378,30 @@
 "file a bug report."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+"Ocurrió una excepción inesperada.<br> Esto siempre es un error de "
+"codificación. Si está ejecutando la última<br>versión de JOSM, por favor sea "
+"tan amable de diligenciar un reporte de fallo."
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Excepción inesperada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
 "sure you have updated to the latest version of JOSM here:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+"Ha encontrado un error en JOSM. Antes de reportar un fallo asegúrese de "
+"haberse actualizado a la última versión de JOSM aquí:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
 "bug report in our bugtracker using this link:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+"También debería actualizar sus plugins. Si ninguna opción ayuda, por favor, "
+"diligencie un reporte de fallo en nuestro sistema de seguimiento de fallos "
+"en la siguiente dirección:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15141,16 +15409,21 @@
 "supply as much detail as possible."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+"Allí la información del error debería haberse llenado automáticamente para "
+"usted.  Por favor incluya información de cómo reproducir el error e intente "
+"ofrecer tanto detalle como le sea posible."
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
 "information below at this URL:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+"Por otra parte, si no funciona, puede diligenciar manualmente la información "
+"en esta URL:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(El texto ya ha sido copiado a tu portapapeles.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Ha encontrado un error en JOSM"
@@ -15174,4 +15447,8 @@
 "Access Token.</html>"
 msgstr ""
+"<html>Fallo al autenticar frente al servidor OSM \"{0}\".<br>Está usando "
+"OAuth para autenticarse pero en el momento no hay<br> una lleva de Acceso "
+"OAuth configurada.<br>Por favor abra el diálogo de preferencias y genere o "
+"ingrese un llave de Acceso</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
@@ -15205,4 +15482,7 @@
 "html>"
 msgstr ""
+"<html>Falló la autenticación ante el servidor OSM con el usuario \"{0}\"."
+"<br>Por favor revise el usuario y la clave en las preferencias de JOSM.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
@@ -15213,4 +15493,7 @@
 "html>"
 msgstr ""
+"<html>Falló la autenticación frente al servidor OSM con la llave OAuth \"{0}"
+"\".<br>Por favor lance el diálogo de preferencias y descargue otra llave "
+"OAuth.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
@@ -15222,4 +15505,8 @@
 "html>"
 msgstr ""
+"<html>Falló la autorización frente al servidor OSM con la llave OAuth \"{0}"
+"\".<br>La llave no está autorizada para acceder al recurso protegido<br>\"{1}"
+"\".<br>Por favor lance el diálogo de preferencias y obtenga otra llave OAuth."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
@@ -15229,8 +15516,10 @@
 "later.</html>"
 msgstr ""
+"<html>El tiempo de comunicación con el servidor OSM \"{0}\" expiró. Por "
+"favor intente más tarde.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
 msgid "no error message available"
-msgstr ""
+msgstr "No hay mensaje de error disponible"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
@@ -15242,4 +15531,8 @@
 "strong>: {2}</html>"
 msgstr ""
+"<html>Falló la comunicación con el servidor OSM \"{0}\". El servidor "
+"respondió<br>con el siguiente código de error y el siguiente mensaje de "
+"error:<br><strong>Código de Error:</strong> {1}<br><strong>Mensaje de Error"
+"(sin traducir)</strong>:{2}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
@@ -15249,4 +15542,6 @@
 "already been closed.</html>"
 msgstr ""
+"<html>Falló el cierre del conjunto de cambios <strong>{0}</strong><br>Debido "
+"a que ya había sido cerrado.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
@@ -15316,4 +15611,6 @@
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
 msgstr ""
+"<html>Fallo al descargar datos. Su formato o bien no está soportado, bien "
+"formado y/o inconsistente.<br><br>Detalles(sin traducir: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
@@ -15355,4 +15652,8 @@
 "check the server''s address ''{0}'' for typos."
 msgstr ""
+"El servidor OSM \"{0}\" no sabe acerca de un objeto<br>que usted trató de "
+"leer, actualizar o borrar. Puede ser que el objeto<br>no exista en el "
+"servidor o que está usando un URL no válido para acceder a él<br>. Por favor "
+"revise cuidadosamente la dirección del servidor \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:415
@@ -15363,4 +15664,7 @@
 "preferences and your internet connection.</html>"
 msgstr ""
+"<html>Fallo al abrir una conexión con el servidor remoto<br>\"{0}\".<br>No "
+"se pudo resolver el nombre de host \"{1}\".<br>Por favor revise la URL del "
+"API en sus preferencias y que tiene conexión a Internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -15372,6 +15676,11 @@
 "<br><br>The error message is:<br>{0}</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+"<html>El servidor reporta que un objeto ha sido borrado.<br><strong>Falló la "
+"subida de datos</strong> si usted estaba tratando de actualizar o borrar "
+"este objeto.<br> <strong>Falló la descarga</strong> en caso de que estuviera "
+"intentando descargar este objeto<br><br>El error del mensaje es:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15385,4 +15694,6 @@
 "problem. JOSM will stop working."
 msgstr ""
+"Fatal: Fallo al localizar la imagen \"{0}\". Este es un problema serio de "
+"configuración. JOSM dejará de trabajar."
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164
@@ -15390,4 +15701,5 @@
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
+"Advertencia: Fallo al manipular fichero zip \"{0}\". La excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216
@@ -15398,4 +15710,6 @@
 "was: {1}"
 msgstr ""
+"Advertencia: fallo al acceder al directorio \"{0}\" por cuestiones de "
+"segurida. La excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
@@ -15405,4 +15719,6 @@
 "''{0}''. Using default code ''en''."
 msgstr ""
+"Advertencia: fallo al derivar prefijo de lenguaje wiki del código \"{0}\" "
+"JOSm de localización. Usando el código predeterminado \"en\"."
 
 #: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
@@ -15411,4 +15727,6 @@
 "platform first."
 msgstr ""
+"Fallo al abrir la URL. No hay establecida una plataforma actualmente. Por "
+"favor indique primero la plataforma."
 
 #. This list if far from complete!
@@ -15423,7 +15741,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:55
 msgid "unused"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+msgstr "no usado"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15437,5 +15755,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15445,5 +15763,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15454,5 +15772,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Pista: Usted puede editar los atajos en las preferencias.)"
@@ -15463,5 +15781,5 @@
 #, java-format
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "Advertencia: fallo al leer MDD de \"{0}\". La excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
@@ -15472,4 +15790,6 @@
 "was: {1}"
 msgstr ""
+"Advertencia: fallo al leer el MDD de \"{0}\" por razones de seguridad. La "
+"excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
@@ -15479,4 +15799,6 @@
 "geometry from preferences."
 msgstr ""
+"La preferencia con llave \"{0}\" no incluye \"{1}\". No se puede restaurar "
+"la geometría de la ventana a partir de las preferencias."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
@@ -15486,4 +15808,7 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
+"La preferencia con llave \"{0}\" no provee un valor entero para \"{1}\". Se "
+"obtuvo {2}. No se puede restaurar la geometría de la ventana a partir de las "
+"preferencias"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
@@ -15493,4 +15818,7 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
+"Fallo al interpretar el campo \"{1}\" en la preferencia con la llave \"{0}"
+"\". La excepción fue: {2}. No se puede restaurar la geometría de la ventana "
+"a partir de las preferencias."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
@@ -15500,4 +15828,6 @@
 "from preferences."
 msgstr ""
+"La preferencia con la llave \"{0}\" no existe.  No se puede restaurar la "
+"geometría de la ventana a partir de las preferencias."
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -15561,5 +15891,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Visibilidad"
@@ -15646,10 +15976,62 @@
 msgstr "Trazas subidas a openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Horario de apertura"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Cambiar las propiedades de hasta {0} objeto"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Seleccionar"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Vía {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Herramienta: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Error al filtrar"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "abrir"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolación de números de portales"
@@ -15819,5 +16201,5 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
 msgid "Align Way Segments"
-msgstr ""
+msgstr "Alinear segmentos de vía"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
@@ -15831,54 +16213,62 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
 msgid "Align Ways"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
+msgstr "Alinear vías"
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "Mensaje de Alinear Vías"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"Alinear resultaría en nodos fuera del planeta.\n"
+"Su acción se deshará."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Estoy list@!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "Consejos para Alinear Vías"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Modo de alineación de vías"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Alinear segmento de vía"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "El parámetro''{0}'' no debe ser nulo"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"El segmento a alinearse no puede ser el mismo que el segmento de "
+"referencia.\n"
+"Por favor elija un segmento diferente para ser alineado."
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "El parámetro''{0}'' no debe ser nulo"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
+msgstr "Mensaje de Alinear Vías"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -15887,4 +16277,7 @@
 "Please choose a different reference segment."
 msgstr ""
+"El segmento de referencia no puede ser el mismo que el elemento a ser "
+"alineado.\n"
+"Por favor elija un segmento de referencia distinto."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
@@ -15903,4 +16296,16 @@
 "</html>"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">Bienvenido al Plugin</span><br>\n"
+"<span style=\"font-size: xx-large;\">Alineación de Vías<span style=\"color: "
+"rgb(204, 85, 0);\">S</span><br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...O mejor debería llamrse <br>\n"
+"Plugin <span style=\"font-size: large;\">AlignWays(Alineación de segmentos "
+"de vía)</span> ...</span>\n"
+"</div>\n"
+"</html>"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:79
@@ -15917,4 +16322,14 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays le\n"
+"ayudará a alinear segmentos de vías.  Puede serle útil cuando por\n"
+"ejemplo traza vías y desea que las laterales estén paralelas al\n"
+"camino o la calle.<br>\n"
+"<br>\n"
+"Algunos consejos antes de comenzar::\n"
+"</p>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -15933,4 +16348,15 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Elija un segmento de referencia.</b> Puede hacerlo con <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>\n"
+"en un segmento. El otro, se hará paralelo a \n"
+"este. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -15951,4 +16377,17 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"<li><b>Seleccione el elemento a ser alineado.</b> Sencillamente <b><i><span "
+"style=\"color:green\">presione el botón del mouse</span></i></b>\n"
+"en un segmento diferente.\n"
+"El pivote de rotación se señalará de forma predeterminada en el \n"
+"centro del segmento.\n"
+"</li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -15969,23 +16408,28 @@
 "\n"
 msgstr ""
-
-#. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
-msgid ""
 "<html>\n"
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
+"<li>Puede <b>cambiar el pivote de rotación</b> si lo desea. Con el fin de "
+"mejorar la paralelización frente al segmento de referencia, el segmento que "
+"se alineará rotará alrededor de este punto. Puede elegir las dos "
+"extremidades o el centro del segmento <b><i><span style=\"color:green"
+"\">haciendo click</span></i></b>cerca.\n"
+"</li>\n"
 "</ul>\n"
 "</div>\n"
 "</html>\n"
 "\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15998,57 +16442,65 @@
 "\n"
 msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Último consejot:</b> Hay una forma sencilla de volver a elegir las "
+"elecciones: <b><i><span style=\"color:green\">Alt-Click</span></i></b> en "
+"algún sitio del mapa.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
-msgstr ""
+msgstr "No mostrar de nuevo"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
-msgstr ""
+msgstr "Dirección de edificación"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
-msgstr ""
+msgstr "Número de Casa:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
-msgstr ""
+msgstr "Nombre de Calle:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
-msgstr ""
+msgstr "Incremento"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
-msgstr ""
+msgstr "Decremento"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
-msgstr ""
+msgstr "Números:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
-msgstr ""
+msgstr "Modo construcciones grandes"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
-msgstr ""
+msgstr "Rotar punto de mira"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
-msgstr ""
+msgstr "Ajustes avanzados"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
-msgstr ""
+msgstr "Etiqueta de edificación"
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
-msgstr ""
+msgstr "No puede ubicar la edificación fuera del planeta."
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:257
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
-msgstr ""
+msgstr "Crear edificación"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
@@ -16056,59 +16508,59 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
-msgstr ""
+msgstr "Establecer tamaño de la edificación"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
-msgstr ""
+msgstr "Usar diálogo de dirección"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
-msgstr ""
+msgstr "Autoseleccionar edificación"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
-msgstr ""
+msgstr "Ancho de las edificaciones:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
-msgstr ""
+msgstr "Longitud del paso:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
-msgstr ""
+msgstr "Avanzado…"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
-msgstr ""
+msgstr "Dibujar edificaciones"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
 msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Seleccione una esquina de la edificación para comenzar a dibujar"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
 msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Seleccione en el punto final para terminar la edificación"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
 msgid "Set width of the building"
-msgstr ""
+msgstr "Establecer ancho de la edificación"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 msgid "on polygon"
-msgstr ""
+msgstr "en polígono"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
 msgid "Add address"
-msgstr ""
+msgstr "Añadir dirección"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
 msgid "Helping tool for tag address"
-msgstr ""
+msgstr "Herramienta de ayuda para establecer dirección"
 
 #. group "Man-Made"
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Edificios"
@@ -16116,22 +16568,23 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
-msgstr ""
+msgstr "Siguiente Número"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
-msgstr ""
+msgstr "Calle"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
-msgstr ""
+msgstr "Ingresar direcciones"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
-msgstr ""
+msgstr "Tomar edificaciones"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
+"Extraer edificación al marcar con el mouse(Solamente imágenes vectoriales)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
@@ -16140,4 +16593,6 @@
 "Buildings layer and an OSM data layer."
 msgstr ""
+"Esta característica requiere(por lo menos) una identificación especial\n"
+"para capas de Edificaciones y capa de datos OSM"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
@@ -16148,4 +16603,7 @@
 "(No = new cache)"
 msgstr ""
+"Se encontró el lugar \"{0}\" en el caché.\n"
+"Invocar primero el caché?\n"
+"(No = nuevo caché)"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -16162,4 +16620,6 @@
 "Probably an old version of the cache file."
 msgstr ""
+"Error al cargar el fichero.\n"
+"Probablemente una versión antigua de caché del fichero."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
@@ -16169,5 +16629,5 @@
 #, java-format
 msgid "Lambert Zone {0} cache file (.{0})"
-msgstr ""
+msgstr "Zona Lambert {0} fichero de caché (.{0})"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
@@ -16186,17 +16646,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
 msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
-msgstr ""
+msgstr "Fichero de Caché Guadeloupe Fort-Marigot (.UTM1)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
 msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
-msgstr ""
+msgstr "Fichero de Caché Guadeloupe Ste-Anne (.UTM2)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
 msgid "Martinique Fort Desaix cache file (.UTM3)"
-msgstr ""
+msgstr "Fichero de Caché Martinique Fort Desaix(.UTM3)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr ""
+msgstr "Fichero de Caché Reunion RGR92 (.UTM4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -16213,4 +16673,6 @@
 "Server in maintenance or temporary overloaded."
 msgstr ""
+"No se puede abrir una nueva sesión de cliente.\n"
+"Servidor en mantenimiento o temporalmente sobrecargado."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91
@@ -16220,4 +16682,7 @@
 "or action canceled"
 msgstr ""
+"No se encontró o no está disponible\n"
+" el barrio o la ciudad {0}, o se canceló\n"
+"la acción"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408
@@ -16248,5 +16713,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257
 msgid "Restore grab shortcut F11"
-msgstr ""
+msgstr "Restaurar atajo F11 para obtener"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262
@@ -16259,4 +16724,6 @@
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
+"Advertencia: fallo al establecer la opción de diálogo siempre visible. La "
+"excepción fue: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -16281,5 +16748,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290
 msgid "Disable image cropping during georeferencing."
-msgstr ""
+msgstr "Deshabilitar sesgar(crop) la imagen durante la georeferencia."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
@@ -16289,9 +16756,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
 msgid "Select first WMS layer in list."
-msgstr ""
+msgstr "Seleccione primero la capa WMS de la lista"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
+"No use relaciones para direcciones (pero \"addr:street\" para elementos)."
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16347,5 +16815,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16356,13 +16824,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid "symbol"
-msgstr ""
+msgstr "símbolo"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
 msgid "parcel"
-msgstr ""
+msgstr "parcela"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "parcel number"
-msgstr ""
+msgstr "parcela"
 
 #. color area
@@ -16416,13 +16884,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
 msgid "locality"
-msgstr ""
+msgstr "localidad"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "section"
-msgstr ""
+msgstr "sección"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "commune"
-msgstr ""
+msgstr "comuna"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
@@ -16500,34 +16968,34 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
 msgid "Image resolution:"
-msgstr ""
+msgstr "Resolución de la imagen:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
 msgid "High resolution (1000x800)"
-msgstr ""
+msgstr "Resolución alta (1000x800)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163
 msgid "Medium resolution (800x600)"
-msgstr ""
+msgstr "Resolución media (800x600)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165
 msgid "Low resolution (600x400)"
-msgstr ""
+msgstr "Resolución baja (600x400)"
 
 #. option to select image zooming interpolation method
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
 msgid "Image filter interpolation:"
-msgstr ""
+msgstr "Filtro de interpolación de imagen:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr ""
+msgstr "Vecino más cercano (La más rápida) [ Predeterminada ]"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184
 msgid "Bilinear (fast)"
-msgstr ""
+msgstr "Bilineal (rápida)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
 msgid "Bicubic (slow)"
-msgstr ""
+msgstr "Bicúbica (lenta)"
 
 #. the vectorized images multiplier
@@ -16538,5 +17006,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
 msgid "Grab one image full screen"
-msgstr ""
+msgstr "Obtener una imagen de pantalla completa"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
@@ -16557,37 +17025,37 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248
 msgid "Layers:"
-msgstr ""
+msgstr "Capas:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251
 msgid "See, rivers, swimming pools."
-msgstr ""
+msgstr "Ver, ríos, piscinas."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254
 msgid "Buildings, covers, underground constructions."
-msgstr ""
+msgstr "Edificaciones, cubiertas, construcciones subterráneas."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257
 msgid "Symbols like cristian cross."
-msgstr ""
+msgstr "Símbolos como la cruz cristiana."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260
 msgid "Parcels."
-msgstr ""
+msgstr "Parcelas."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263
 msgid "Parcels numbers, street names."
-msgstr ""
+msgstr "Parcelas"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266
 msgid "Address, houses numbers."
-msgstr ""
+msgstr "Dirección, números de casa."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269
 msgid "Locality, hamlet, place."
-msgstr ""
+msgstr "Localidad, caserío, lugar."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272
 msgid "Cadastral sections and subsections."
-msgstr ""
+msgstr "Secciones y subsecciones catastrales"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275
@@ -16619,9 +17087,9 @@
 "Automatically selects the first WMS layer if multiple layers exist when "
 "grabbing."
-msgstr ""
+msgstr "Seleccionar automáticamente la primera capa WMS si hay varias capas."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348
 msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr ""
+msgstr "Habilitar para emplear la etiqueta \"add:street\" en los nodos."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -16676,9 +17144,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:33
 msgid "Contacting cadastre WMS ..."
-msgstr ""
+msgstr "Contactando WMS de catastro..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:40
 msgid "Image already loaded"
-msgstr ""
+msgstr "Imagen descargada previamente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:76
@@ -16687,4 +17155,6 @@
 "Use the normal Cadastre Grab menu."
 msgstr ""
+"Municipalidad vectorizada!\n"
+"Use el menú de obtención usual de Catastro."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
@@ -16698,5 +17168,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Grab building layer only"
-msgstr ""
+msgstr "Obtener capa de edificaciones únicamente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
@@ -16708,4 +17178,7 @@
 "projections and retry"
 msgstr ""
+"Para habilitar el plugin de catastro WMS, cambie la\n"
+"proyección actual a una de proyección catastral\n"
+"y reintente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
@@ -16721,9 +17194,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
 msgid "Grab non-georeferenced image"
-msgstr ""
+msgstr "Obtener imagen no georeferenciada"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:79
 msgid "Georeferencing interrupted"
-msgstr ""
+msgstr "Georeferencia interrumpida"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:115
@@ -16732,4 +17205,6 @@
 "Do you want to use them ?"
 msgstr ""
+"Esta imagen contiene información de georeferencia.\n"
+"Desea usarla?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:186
@@ -16738,13 +17213,15 @@
 "(two points required)"
 msgstr ""
+"Para esquilar(crop) elija la primera esquina\n"
+"(se requiere dos puntos)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:206
 msgid "Image cropping"
-msgstr ""
+msgstr "esquilar imagen(cropping)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:205
 msgid "Click second corner for image cropping"
-msgstr ""
+msgstr "Seleccione la segunda esquina para esquilar(crop)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:225
@@ -16757,5 +17234,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
 msgid "Image georeferencing"
-msgstr ""
+msgstr "Georeferenciar imagen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:244
@@ -16768,12 +17245,14 @@
 "or just retry "
 msgstr ""
+"Desea cancelar completamente\n"
+"o reintentar "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:292
 msgid "Enter cadastre east,north position"
-msgstr ""
+msgstr "Entre posición de catastro este,norte"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:294
 msgid "(Warning: verify north with arrow !!)"
-msgstr ""
+msgstr "(Advertencia: verifique el norte con la flecha !!)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:296
@@ -16781,16 +17260,12 @@
 msgstr "Este"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Norte"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
-msgstr ""
+msgstr "Uso el ratón"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:318
 #, java-format
 msgid "Set {0} Lambert coordinates"
-msgstr ""
+msgstr "Establecer {0} coordenadas Lambert"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
@@ -16801,5 +17276,5 @@
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
+msgstr "No se permite {0} con la proyección actual"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
@@ -16808,4 +17283,6 @@
 "Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
+"No se puede cargar el caché {0} que es incompatible con la proyección actual "
+"de la zona"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
@@ -16814,13 +17291,15 @@
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
+"El fichero seleccionado {0} no es un fichero de caché de este plugin"
+"(extensión inválida)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
 #, java-format
 msgid "The location {0} is already on screen. Cache not loaded."
-msgstr ""
+msgstr "El lugar {0} ya está en la pantalla. No se carga caché."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
 msgid "(optional)"
-msgstr ""
+msgstr "(opcional)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16834,9 +17313,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:68
 msgid "Add a new municipality layer"
-msgstr ""
+msgstr "Adicionar una nueva capa de municipalidad"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
 msgid "Commune"
-msgstr ""
+msgstr "Comuna"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:72
@@ -16850,9 +17329,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
 msgid "Departement"
-msgstr ""
+msgstr "Departamento"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
 msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html>Número de Departamento (opcional)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
@@ -16890,4 +17369,6 @@
 "a cadastre \"plan image\" (raster image)"
 msgstr ""
+"Este modo funciona solamente si la capa activa es\n"
+"una \"imagen plana\" de catastro (imagen ráster)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47
@@ -16900,6 +17381,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Capa vacía"
@@ -16945,4 +17426,5 @@
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
+"La zona Lambert {0} en caché es incompatible con la zona Lambert actual {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
@@ -17033,5 +17515,5 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
 msgid "Download Along"
-msgstr ""
+msgstr "Descargar aledaño"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
@@ -17042,15 +17524,15 @@
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} nodos intermedios para descargar."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
 #, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr ""
+msgstr "entre {0} {1} y {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
 #, java-format
 msgid "  adding {0} {1}"
-msgstr ""
+msgstr "  añadiendo {0} {1}"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17120,21 +17602,21 @@
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188
 msgid "Child script have returned invalid data."
-msgstr ""
+msgstr "El script hijo devolvió datos invalidos."
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
-msgstr ""
+msgstr "Herramienta de Edición"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
-msgstr ""
+msgstr "Nombre:"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
-msgstr ""
+msgstr "Línea de Comando:"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26
 msgid "External tools"
-msgstr ""
+msgstr "Herramientas externas"
 
 #. Plugin ext_tools
@@ -17147,5 +17629,5 @@
 #, java-format
 msgid "Delete tool \"{0}\"?"
-msgstr ""
+msgstr "¿Eliminar herramienta \"{0}\"?"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
@@ -17155,9 +17637,9 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
 msgid "New tool..."
-msgstr ""
+msgstr "Nueva Herramienta..."
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
 msgid "Install"
-msgstr ""
+msgstr "Instalar"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -17807,5 +18289,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160
 msgid "Unable to find via nodes. Please check your selection"
-msgstr ""
+msgstr "No se encontraron nodos de vía. Por favor revise su selección"
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
@@ -18006,5 +18488,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
 msgid "You have unsaved changes in your queue. Do you want to submit them now?"
-msgstr ""
+msgstr "Tiene cambios no guardados. Desea enviarlos ya?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:67
@@ -18049,145 +18531,148 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
-msgstr ""
+msgstr "¡Error de lectura!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
-msgstr ""
+msgstr "¡Error de escritura!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
 msgid "Write coordinates to image header"
-msgstr ""
+msgstr "Escribir coordenadas en el encabezado de la imagen"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
+"Escribir información de posición en el encabezado exif de los siguientes "
+"ficheros."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
-msgstr ""
+msgstr "configuracion"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
-msgstr ""
+msgstr "mantener archivos de respaldo"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
-msgstr ""
+msgstr "cambiar hora de modificación del fichero"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
-msgstr ""
+msgstr "A hora gps"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
-msgstr ""
+msgstr "Al valor anterior (no se cambia mtime)"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
-msgstr ""
+msgstr "Plugin para geolocalización de fotografías"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
-msgstr ""
+msgstr "Escribiendo información de posición a ficheros de imágenes..."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
-msgstr ""
+msgstr "No se pudo leer mtime."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
-msgstr ""
+msgstr "No se pudo escribir mtime"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
-msgstr ""
+msgstr "¡No se pudo eliminar el fichero!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
-msgstr ""
+msgstr "¡No se pudo renombrar el fichero!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
+"<html><h3>Hay archivos de respaldo antiguos en el directorio de imágenes</h3>"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
-msgstr ""
+msgstr "¿Sobreescribir copias de respaldo antiguas?"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
-msgstr ""
+msgstr "Mantener copias de respaldo antiguas y continuar"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
-msgstr ""
+msgstr "Sobrescribir"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
-msgstr ""
+msgstr "¡No se pudo borrar fichero temporal!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
-msgstr ""
+msgstr "La prueba falló: No se pudo leer el mtime."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
+msgstr "La prueba falló: no se pudo escribir el mtime"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
 msgid "Calibration Files"
-msgstr ""
+msgstr "Calibrar ficheros"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
 msgid "Load Picture Calibration..."
-msgstr ""
+msgstr "Cargar calibración de imágenes..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
 msgid "Loads calibration data to a file"
-msgstr ""
+msgstr "Carga calibración de datos al fichero"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
 #, java-format
 msgid "Loading file failed: {0}"
-msgstr ""
+msgstr "Falló la carga del fichero: {0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "PicLayer move"
-msgstr ""
+msgstr "Mover Capa de Imagen(PicLayer)"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "Drag to move the picture"
-msgstr ""
+msgstr "Arrastre para mover la imagen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42
 msgid "New picture layer from clipboard"
-msgstr ""
+msgstr "Nueva capa de imágenes desde el portapapeles"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
 msgid "Image files"
-msgstr ""
+msgstr "Archivos de imágenes"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
 msgid "New picture layer from file..."
-msgstr ""
+msgstr "Nueva capa de imágenes desde un archivo..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
-msgstr ""
+msgstr "No se creó apropiadamente la imagen."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
-msgstr ""
+msgstr "No se encontró el objeto mapa."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:45
 msgid "Nothing in clipboard"
-msgstr ""
+msgstr "Nada en el portapapeles"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:54
 msgid "The clipboard data is not an image"
-msgstr ""
+msgstr "Los datos del portapapeles no son una imagen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -18197,83 +18682,83 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
 msgid "Resets picture calibration"
-msgstr ""
+msgstr "Reiniciar calibración de imágenes"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
 msgid "Resets picture rotation"
-msgstr ""
+msgstr "Reiniciar rotación de imágenes"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
 msgid "Reset position"
-msgstr ""
+msgstr "Reiniciar posición"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
 msgid "Resets picture position"
-msgstr ""
+msgstr "Reinicia posición de la imagen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
 msgid "Scale"
-msgstr ""
+msgstr "Escalar"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
 msgid "Resets picture scale"
-msgstr ""
+msgstr "Reinicia escala de la imagen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "PicLayer rotate"
-msgstr ""
+msgstr "Rotar capa de imagen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "Drag to rotate the picture"
-msgstr ""
+msgstr "Arrastre para rotar la imagen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
 msgid "Save Picture Calibration..."
-msgstr ""
+msgstr "Guardar calibración de imagen..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
 msgid "Saves calibration data to a file"
-msgstr ""
+msgstr "Guardar la calibración de datos a un fichero"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
 msgid "JOSM PicLayer plugin calibration data"
-msgstr ""
+msgstr "Plugin de calibración de datos PicLayer JOSM"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
 #, java-format
 msgid "Saving file failed: {0}"
-msgstr ""
+msgstr "Fallo al almacenar fichero: {0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "PicLayer scale X"
-msgstr ""
+msgstr "Escala de PicLayer X"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "Drag to scale the picture in the X Axis"
-msgstr ""
+msgstr "Arrastrar para escalar la imagen en el eje X"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "PicLayer scale"
-msgstr ""
+msgstr "Escala PicLayer"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "Drag to scale the picture in the X and Y Axis"
-msgstr ""
+msgstr "Arrastre para escalar la imagen en los ejes X y Y"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "PicLayer scale Y"
-msgstr ""
+msgstr "Escala Y PicLayer"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "Drag to scale the picture in the Y Axis"
-msgstr ""
+msgstr "Arrastre para escalar la imagen en el eje Y"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
 msgid "Create Stops from GTFS ..."
-msgstr ""
+msgstr "Crear paradas de GTFS ..."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
 msgid "Create Stops from a GTFS file"
-msgstr ""
+msgstr "Crear paradas de un fichero GTFS"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18281,13 +18766,13 @@
 #, java-format
 msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "Ocurrió  una excepción de entrada Salida \"{0}\""
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
 msgid "GTFS-Stops"
-msgstr ""
+msgstr "Paradas-GTFS"
 
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Transporte público"
@@ -18295,22 +18780,22 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:409
 msgid "Route patterns ..."
-msgstr ""
+msgstr "Patrones de ruta..."
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:410
 msgid "Edit Route patterns for public transport"
-msgstr ""
+msgstr "Editar patrones de ruta para transporte público"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:422
 msgid "Overview"
-msgstr ""
+msgstr "Descripción general"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:426
 msgid "Itinerary"
-msgstr ""
+msgstr "Itinerario"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:428
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:87
 msgid "Stops"
-msgstr ""
+msgstr "Paradas"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:430
@@ -18321,59 +18806,64 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:109
 msgid "Create Stops from GPX ..."
-msgstr ""
+msgstr "Crear paradas de GPX ..."
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75
 msgid "Create Stops from a GPX file"
-msgstr ""
+msgstr "Crear paradas de un fichero GPX"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
 msgid "Tracks"
-msgstr ""
-
-#. item "Ways/Steps" text "Width (meters)"
+msgstr "Vías"
+
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Nodos de Vía"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "carga de datos desde el API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "Datos importados de {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "crear nuevos objetos"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "cambiar la selección"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "modificar vista general"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgstr "leer versión de protocolo"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "confirmar todas las acciones manuales de control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un componente que permite a JOSM ser controlado por otras aplicaciones."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Ajustes para el componente Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18385,38 +18875,40 @@
 "comunicarse con el complemento."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Acciones permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "confirmar la acción del control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+msgstr "El Control Remoto recibió una solicitud para crear un nodo nuevo."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "El control remoto ha pedido cagar datos desde el API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalles requeridos: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
 "web sites to detect a running JOSM."
 msgstr ""
+"Se ha solicitado al Control Remoto que reporte su versión de protocolo. Esto "
+"permite a los sitios web detectar un JOSM ejecutándose."
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
@@ -18426,5 +18918,5 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
-msgstr ""
+msgstr "Revertir únicamente selección"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
@@ -18445,22 +18937,22 @@
 #, java-format
 msgid "Missing merge target for {0} with id {1}"
-msgstr ""
+msgstr "Destino de mezcla ausente para {0} con id {1}"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
 msgid "Objects history"
-msgstr ""
+msgstr "Historial de objetos"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
 msgid "History reverter"
-msgstr ""
+msgstr "Revertidor de historia"
 
 #: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:52
 msgid "Preparing history data..."
-msgstr ""
+msgstr "Preparando datos de historia..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:50
 msgid "Reverting..."
-msgstr ""
+msgstr "Revirtiendo"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
@@ -18469,16 +18961,19 @@
 "It is needed to download them before reverting. Do you want to continue?"
 msgstr ""
+"Este conjunto de cambios tiene objetos que no están presentes en el conjunto "
+"de datos actual.\n"
+"Se requiere descargarlos antes de revertir. ¿Desea continuar?"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:60
 msgid "Confirm"
-msgstr ""
+msgstr "Comfirmar"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Obteniendo primitivas faltantes"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Descargando conjunto de cambios"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18489,37 +18984,37 @@
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 msgid "Road Sign Plugin"
-msgstr ""
+msgstr "Plugin de señales de tránsito"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Roadsign tagging"
-msgstr ""
+msgstr "Etiquetas de señales de tránsito"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "Añadir etiquetas al seleccionar señales de tránsito"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54
 msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "plugin de señales de tránsito"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:89
 #, java-format
 msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "No se pudo leer fuente predeterminada de etiquetas: \"{0}\""
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:97
 #, java-format
 msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Error al interpretar predeterminados de \"{0}\":\n"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108
 #, java-format
 msgid "Sign {0}"
-msgstr ""
+msgstr "Señal {0}"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115
 #, java-format
 msgid "Additional sign {0}"
-msgstr ""
+msgstr "Señal Adicional {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18633,60 +19128,60 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 msgid "Delete unnecessary nodes from an area."
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+msgstr "Eliminar nodos innecesarios de un área"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Mostrar información de la tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Incrementar zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Reducir zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Ajustar al tamaño de la tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Alinear caché de teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "imagen "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "zoom automático"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "Carga automática de teselas"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ajustes para el complmento SlippyMap"
@@ -18772,5 +19267,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
 msgid "Surveyor waypoint layer"
-msgstr ""
+msgstr "Capa de encuesta de puntos de vía"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
@@ -18786,5 +19281,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
 msgid "Waypoint Description"
-msgstr ""
+msgstr "Descripción de punto de vía"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:25
@@ -18804,9 +19299,9 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:290
 msgid "Abort tag editing and close dialog"
-msgstr ""
+msgstr "Dejar la edición de etiquetas y cerrar el diálogo"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:303
 msgid "Apply edited tags and close dialog"
-msgstr ""
+msgstr "Aplicar etiquetas editadas y cerrar diálogo"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
@@ -18861,5 +19356,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:59
 msgid "Enter housenumbers or amount of segments"
-msgstr ""
+msgstr "Ingresar números de casa o valores de segmentos"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:86
@@ -18878,5 +19373,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:157
 msgid "Lowest Number"
-msgstr ""
+msgstr "Menor número"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:159
@@ -18886,21 +19381,21 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:161
 msgid "Highest Number"
-msgstr ""
+msgstr "Mayor número"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:162
 msgid "add to existing associatedStreet relation"
-msgstr ""
+msgstr "Agregar a una relación de asociación de calle existente"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:162
 msgid "create an associatedStreet relation"
-msgstr ""
+msgstr "crear una relación de asociación de calle"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:165
 msgid "delete outline way"
-msgstr ""
+msgstr "Eliminar vía resaltada"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:185
 msgid "Street name: "
-msgstr ""
+msgstr "Nombre de calle: "
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:268
@@ -18933,5 +19428,5 @@
 #, java-format
 msgid "{0} must be greater than 0"
-msgstr ""
+msgstr "{0} debe ser mayor que 0"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:240
@@ -18954,5 +19449,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
 msgid "Cannot reverse!"
-msgstr ""
+msgstr "No se puede revertir!"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
@@ -18977,37 +19472,36 @@
 msgstr "Edificios entre medianeras"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Editar símbolos SeaMap"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr "Editar OpenSeaMap"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
-msgstr ""
+msgstr "Editor de marcas marinas"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse"
-msgstr ""
+msgstr "Explorar"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse map with left button"
-msgstr ""
+msgstr "Explorar el mapa con el botón izquierdo"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
-msgstr ""
+msgstr "Mezclar nodos de objetos"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 msgid "Tracer"
-msgstr ""
+msgstr "Trazador"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 msgid "Tracer."
-msgstr ""
+msgstr "Trazador."
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
 msgid "Tracer building"
-msgstr ""
+msgstr "Trazador de construcción"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:43
@@ -19027,12 +19521,14 @@
 "default value ''shift ctrl T''."
 msgstr ""
+"Advertencia: valor ilegal \"{0}\" para la llave de preferencia \"{1}\". "
+"Volver al valor predeterminado \"shift ctrl T\"."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
 msgid "Create/Edit turn restriction..."
-msgstr ""
+msgstr "Crear/Editar restricción de giro..."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
 msgid "Create or edit a turn restriction."
-msgstr ""
+msgstr "Crear o editar restricción de giro."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42
@@ -19054,27 +19550,27 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
 msgid "Type:"
-msgstr ""
+msgstr "Tipo:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
 msgid "From:"
-msgstr ""
+msgstr "De:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
 msgid "To:"
-msgstr ""
+msgstr "A:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
 msgid "Vias:"
-msgstr ""
+msgstr "Vías:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
 msgid "Copy to the clipboard"
-msgstr ""
+msgstr "Copiar al portapapeles"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:423
 #, java-format
 msgid "Cannot find object with id ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "No se puede encontrar el objeto con id \"{0}\" en la capa \"{1}\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:426
@@ -19084,12 +19580,15 @@
 "invisible in layer ''{1}''"
 msgstr ""
+"No se puede agregar el objeto \"{0}\" como un miembro de relación porque ha "
+"sido borrado o no es visible en la capa \"{1}\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
 msgid "Clear the selected roles or delete the selected members"
-msgstr ""
+msgstr "Limpiar los roles seleccionados o borrar los miembros seleccionados"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:128
 msgid "Insert new relation members from object in the clipboard"
 msgstr ""
+"Insertar una nueva relación de miembros desde el objeto en el portapapeles"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167
@@ -19103,9 +19602,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
 msgid "Edit basic attributes of a turn restriction"
-msgstr ""
+msgstr "Editar atributos básicos de una restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr ""
+msgstr "Editar las etiquetas y los miembros de esta restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141
@@ -19126,10 +19625,10 @@
 #, java-format
 msgid "Edit a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Editar una nueva restricción de giro en la capa \"{0}\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:284
 #, java-format
 msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Editar restricción de giro \"{0}\" en la capa \"{1}\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398
@@ -19166,9 +19665,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:417
 msgid "Cancel saving and start resolving pending issues first"
-msgstr ""
+msgstr "Cancelar guardado y comenzar a resolver asuntos pendientes primero"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:425
 msgid "Pending errors and warnings"
-msgstr ""
+msgstr "Errores pendientes y advertencias"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:484
@@ -19181,5 +19680,9 @@
 "restriction editor:"
 msgstr[0] ""
+"Esta restricción de giro se refiere a un objeto que ha sido eliminado fuera "
+"de este editor de restricción de giro:"
 msgstr[1] ""
+"Esta restricción se refiere a {0} objetos que han sido eliminados fuera de "
+"este editor de restricción de giro:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:497
@@ -19188,26 +19691,28 @@
 "removed.<br>How to you want to proceed?"
 msgstr ""
+"No se puede guardar las actualizaciones a esta restricción de giro a menos "
+"que se eliminen los miembros removidos. <br>¿Cómo desea proceder?"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:502
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:504
 msgid "Remove deleted members and save"
-msgstr ""
+msgstr "Remover miembros eliminados y guardar"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:508
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:510
 msgid "Cancel and return to editor"
-msgstr ""
+msgstr "Cancelar y volver al editor"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:518
 msgid "Deleted members in turn restriction"
-msgstr ""
+msgstr "Miembros eliminados en restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:597
 msgid "Create a conflict and close this turn restriction editor"
-msgstr ""
+msgstr "Crear un conflicto y cerrar este editor de restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:603
 msgid "Return to the turn restriction editor and resume editing"
-msgstr ""
+msgstr "Volver al editor de restricción de giro y continuar editando"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:610
@@ -19217,4 +19722,7 @@
 "a conflict and close the editor?</html>"
 msgstr ""
+"<html>Esta restricción de giro ha cambiado fuera del editor.<br>No puede "
+"aplicar sus cambios y continuar editando.<br><br>¿Desea crear un conflicto y "
+"cerrar el editor?</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
@@ -19224,20 +19732,23 @@
 "resolve this conflict first, then try again.</html>"
 msgstr ""
+"<html>La capa \"{0}\" ya contiene un conflicto para el objeto<br>\"{1}\"."
+"<br>Por favor resuelva este conflicto primero e intente de nuevo.</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
-msgstr ""
+msgstr "Participando ya en un conflicto"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
 msgid "Delete this turn restriction"
-msgstr ""
+msgstr "Borrar esta restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
 msgid "Select this turn restriction"
-msgstr ""
+msgstr "Seleccionar esta restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
 msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
+"Activar la capa a la cual pertenece esta restricción de giro e ir a ella."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
@@ -19245,6 +19756,6 @@
 msgid "{0} warning"
 msgid_plural "{0} warnings"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} advertencia"
+msgstr[1] "{0} advertencias"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:847
@@ -19257,5 +19768,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:860
 msgid "no issues"
-msgstr ""
+msgstr "No hay asuntos por resolver"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147
@@ -19266,17 +19777,17 @@
 #, java-format
 msgid "multiple objects with role ''{0}''"
-msgstr ""
+msgstr "Múltiples objetos con rol \"{0}\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
 msgid "Delete from turn restriction"
-msgstr ""
+msgstr "Borrar de restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354
 msgid "Paste from the clipboard"
-msgstr ""
+msgstr "Pegar del portapapeles"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:220
 msgid "Create new turn restriction"
-msgstr ""
+msgstr "Crear nueva restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:221
@@ -19317,4 +19828,5 @@
 msgid "Warning: failed to load icon for turn restriction type ''{0}''"
 msgstr ""
+"Advertencia: fallo al cargar ícono para restricción de giro tipo \"{0}\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
@@ -19352,13 +19864,13 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193
 msgid "Use standard exceptions"
-msgstr ""
+msgstr "Usar excepciones estándar"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:203
 msgid "Use non-standard exceptions"
-msgstr ""
+msgstr "Usar excepciones no estándar"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156
 msgid "Remove the currently selected vias"
-msgstr ""
+msgstr "Remover las vías actualmente seleccionadas"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
@@ -19372,9 +19884,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231
 msgid "Copy the selected vias to the clipboard"
-msgstr ""
+msgstr "Copiar las vías seleccionadas al portapapeles"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264
 msgid "Insert 'via' objects from the clipboard"
-msgstr ""
+msgstr "Insertar objetos 'vía' desde el portapapeles"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
@@ -19384,24 +19896,26 @@
 "''via''."
 msgstr ""
+"Fallo al obtener objeto OSM con id {0} del conjunto de datos {1}. No se "
+"puede adicionar como \"vía\"."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125
 msgctxt "turnrestrictions"
 msgid "From:"
-msgstr ""
+msgstr "De:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:136
 msgctxt "turnrestriction"
 msgid "To:"
-msgstr ""
+msgstr "A:"
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:173
 msgid "no participating way with role ''from''"
-msgstr ""
+msgstr "Vía no participante con el rol \"de\""
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:183
 msgid "no participating way with role ''to''"
-msgstr ""
+msgstr "Vía no participante con el rol \"a\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104
@@ -19431,9 +19945,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
 msgid "Open an editor for the selected turn restricion"
-msgstr ""
+msgstr "Abrir un editor para la restricción de giro seleccionada"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
 msgid "Delete the selected turn restriction"
-msgstr ""
+msgstr "Borrar la restricción de giro seleccionada"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:314
@@ -19449,5 +19963,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:355
 msgid "Select in current data layer"
-msgstr ""
+msgstr "Seleccionar en la capa actual de datos"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386
@@ -19510,4 +20024,6 @@
 "Assuming the default value ''set-a''."
 msgstr ""
+"Advertencia: La preferencia con llave \"{0}\" tiene un valor no soportado "
+"\"{1}\". Asumiendo que el valor predeterminado \"conjunto-a\"."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
@@ -19558,4 +20074,8 @@
 "the way with role <tt>to</tt>, though."
 msgstr ""
+"Esta restricción de giro usa la vía OSM <span class=\"object-name\">{0}</"
+"span> con rol <tt>de</tt> <strong>y</strong> con rol <tt>a</tt>. En una "
+"restricción de giro, la vía con el rol <tt>de</tt> debería ser diferente a "
+"la vía con el rol <tt>a</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -19565,5 +20085,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
 msgid "Removes the member with role ''from''"
-msgstr ""
+msgstr "Elminar el miembro con el rol \"de\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
@@ -19573,5 +20093,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
 msgid "Removes the member with role ''to''"
-msgstr ""
+msgstr "Eliminar el miembro con el rol \"a\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
@@ -19589,4 +20109,6 @@
 "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
 msgstr ""
+"Ir al editor básico y elegir manualmente los miembros con roles \"de\" y \"a"
+"\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
@@ -19597,4 +20119,7 @@
 "only. Please select one in the Basic editor."
 msgstr ""
+"Esta restricción de giro usa una restricción no estándar de tipo <tt>{0}</"
+"tt> para la etiqueta <tt>restriction</tt>.  Es recomendable usar valores "
+"estándares. Por favor seleccione uno en el editor básico."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36
@@ -19602,4 +20127,5 @@
 msgid "Go to Basic Editor and manually choose a turn restriction type"
 msgstr ""
+"Ir al editor básico y escoger manualmente un tipo de restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
@@ -19613,8 +20139,14 @@
 "object."
 msgstr ""
+"La vía-<strong>de</strong> <span class=\"object-name\">{0}</span> y la vía-"
+"<strong>a</strong> <span class=\"object-name\">{1}</span> se intersectan en "
+"el nodo <span class=\"object-name\">{2}</span> pero <span class=\"object-name"
+"\">{2}</span> no es un objeto de tipo <strong>vía</strong>.<br> Se "
+"recomienda establecer a  <span class=\"object-name\">{2}</span> como único "
+"objeto-<strong>via</strong>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
 msgid "Set via-Object"
-msgstr ""
+msgstr "Establecer Objeto-vía"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
@@ -19623,8 +20155,10 @@
 "intersection"
 msgstr ""
+"Reemplaza el objeto-via configurado actualmente con el nodo en la "
+"intersección"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr ""
+msgstr "Ir al editor básico y arreglar manualmente el listado de objetos-vía"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
@@ -19677,8 +20211,10 @@
 "restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"Una restricción de giro requiere exactamente una vía con rol <tt>a</tt>. "
+"Esta resricción tiene {0} vías con este rol. Por favor remueva {1} de ellas."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
 msgid "Go to the Advanced Editor and remove the members"
-msgstr ""
+msgstr "Ir al editor avanzado y remover los miembros"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
@@ -19688,22 +20224,26 @@
 "recommended to use standard values for <tt>except</tt> only."
 msgstr ""
+"La etiqueta <tt>except</tt> tiene el valor no estándar <tt>{0}</tt>. Se "
+"recomienda usar únicamente valores estándar para <tt>except</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
 msgstr ""
+"Ir al editor básico y seleccionar excepciones basdas en tipo de vehículo "
+"estándar"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
 #, java-format
 msgid "The required tag <tt>{0}={1}</tt> is missing."
-msgstr ""
+msgstr "Hace falta la etiqueta requerida <tt>{0}={1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
 msgid "Add missing tag"
-msgstr ""
+msgstr "Añadir etiqueta faltante"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
 #, java-format
 msgid "Add the missing tag {0}={1}"
-msgstr ""
+msgstr "Añadir la etiqueta faltante {0}={1}"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
@@ -19715,12 +20255,15 @@
 "connects to way <span class=\"object-name\">{3}</span>."
 msgstr ""
+"La vía OSM <span class=\"object-name\">{0}</span> con el rol <tt>{1}</tt> "
+"debería partirse en el nodo  <span class=\"object-name\">{2}</span> donde se "
+"conecta a la vía <span class=\"object-name\">{3}</span>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
-msgstr ""
+msgstr "Partir ahora"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
-msgstr ""
+msgstr "Parte la vía"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
@@ -19730,4 +20273,6 @@
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
+"Esta restricción de giro usa el nodo <span class=\"object-name\">{0}</span> "
+"como miembro del rol <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
@@ -19737,8 +20282,10 @@
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
+"Esta restricción de giro usa la relación OSM <span class=\"object-name\">{0}"
+"</span> como miembro del rol <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
 msgid "An OSM way is required instead."
-msgstr ""
+msgstr "Se requiere una vía OSM"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
@@ -19748,52 +20295,52 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
 msgid "Change to the Basic Editor and select an OSM way"
-msgstr ""
+msgstr "Cambiar al editor básico y seleccionar una vía OSM"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
 msgid "Undelete object..."
-msgstr ""
+msgstr "Recuperar objeto..."
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
 msgid "Undelete object by id"
-msgstr ""
+msgstr "Recuperar objeto por id"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70
 msgid "Select if the data should be added into a new layer"
-msgstr ""
+msgstr "Seleccionar si los datos deberían adicionarse a una nueva capa"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88
 msgid "Enter the ID of the object that should be undeleted"
-msgstr ""
+msgstr "Ingrese el ID del objeto que se desea recuperar"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100
 msgid "Undelete Object"
-msgstr ""
+msgstr "Recuperar objeto borrado"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 msgid "Undelete object"
-msgstr ""
+msgstr "Recuperar objeto borrado"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
 msgid "Start undeleting"
-msgstr ""
+msgstr "Iniciar recuperación"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107
 msgid "Close dialog and cancel"
-msgstr ""
+msgstr "Cerrar diálogo y cancelar"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162
 #, java-format
 msgid "Will get {0}"
-msgstr ""
+msgstr "Se obtendrá {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166
 #, java-format
 msgid "Looking for {0}"
-msgstr ""
+msgstr "Buscando {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168
 #, java-format
 msgid "Found {0}"
-msgstr ""
+msgstr "Se encontró {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
@@ -20048,25 +20595,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
 msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "Mezclar nodos con tipo duplicado"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
 msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "Nodos duplicados de autopista"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
 msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "Nodos duplicados de ferrocarril"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
 msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "Nodos duplicados de agua"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
 msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "Nodos duplicados de vecindades"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
 msgid "Power duplicated nodes"
-msgstr ""
+msgstr "Nodos duplicados de electricidad"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20105,5 +20652,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -20115,5 +20662,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
 msgid "Area style way is not closed"
-msgstr ""
+msgstr "La vía estilo área no ha sido cerrada"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
@@ -20123,17 +20670,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
 msgid "No style in multipolygon relation"
-msgstr ""
+msgstr "Relación multipolígono sin estilo"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
 msgid "Style for inner way equals multipolygon"
-msgstr ""
+msgstr "Estilo de vía interna es multipolígono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
 msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "Estilo para vía externa no compatible"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
 msgid "No style for multipolygon"
-msgstr ""
+msgstr "Multipolígono sin estilo"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:191
@@ -20143,5 +20690,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
 msgid "Multipolygon inner way is outside"
-msgstr ""
+msgstr "vía interna multipolígono está afuera"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
@@ -20151,9 +20698,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:227
 msgid "No useful role for multipolygon member"
-msgstr ""
+msgstr "Miembro de multipolígono no tiene un rol útil"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:230
 msgid "Non-Way in multipolygon"
-msgstr ""
+msgstr "No-vía dentro de multipolígono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -20177,5 +20724,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:74
 msgid "A name is missing, even though name:* exists."
-msgstr ""
+msgstr "Falta un nombre, a pesar de que existe:*."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:25
@@ -20230,61 +20777,61 @@
 msgstr "Vías superpuestas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "Corrector de relaciones:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+msgstr "Este plugin revisa errores en relaciones."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+msgstr "Tipo de relación desconocido"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+msgstr "La relación es vacía"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+msgstr "Falta el rol {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr "Problema de verificación de rol"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr "{0} es una cantidad de roles muy baja ({1})"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr "{0} es una cantidad de roles muy alta ({1})"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr "Miembro de rol {0} con tipo erróneo"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr "Rol {0} desconocido"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
-msgstr ""
+msgstr "Se encontró un rol vacío"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
@@ -20353,17 +20900,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
 msgid "Tag value contains character with code less than 0x20"
-msgstr ""
+msgstr "El valor de la etiqueta contiene un caracter con código menor que 0x20"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
 msgid "Tag key contains character with code less than 0x20"
-msgstr ""
+msgstr "La etiqueta de la llave contine un caracter con código menor que 0x20"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
 msgid "Tag value longer than allowed"
-msgstr ""
+msgstr "Valor de etiqueta más largo de lo permitido"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491
 msgid "Tag key longer than allowed"
-msgstr ""
+msgstr "Valor de la llave de la etiqueta más largo de lo permitido"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
@@ -20531,5 +21078,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:35
 msgid "Turnrestriction"
-msgstr ""
+msgstr "Restricción de giro"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:36
@@ -20540,49 +21087,49 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:103
 msgid "Unknown role"
-msgstr ""
+msgstr "Rol desconocido"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:107
 msgid "Unknown member type"
-msgstr ""
+msgstr "Tipo de miembro desconocido"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
 msgid "More than one \"from\" way found"
-msgstr ""
+msgstr "Se encontró más de una vía \"de\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115
 msgid "More than one \"to\" way found"
-msgstr ""
+msgstr "Se encontró más de una vía \"aA"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117
 msgid "More than one \"via\" way found"
-msgstr ""
+msgstr "Se encontró más de una \"vía\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:120
 msgid "No \"from\" way found"
-msgstr ""
+msgstr "No se encontró una vía \"de\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:124
 msgid "No \"to\" way found"
-msgstr ""
+msgstr "No se encontró una vía \"a\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:128
 msgid "No \"via\" node or way found"
-msgstr ""
+msgstr "No se encontro un nodo o vía \"via\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
 msgid "The \"from\" way does not start or end at a \"via\" node"
-msgstr ""
+msgstr "La vía \"de\" no comienza al final de un nodo \"vía\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
 msgid "The \"to\" way does not start or end at a \"via\" node"
-msgstr ""
+msgstr "La vía \"a\" no comienza o termina en el nodo \"vía\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:176
 msgid "The \"from\" way does not start or end at a \"via\" way."
-msgstr ""
+msgstr "la vía \"de\" no comienza o termina en unva vía \"via\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:181
 msgid "The \"to\" way does not start or end at a \"via\" way."
-msgstr ""
+msgstr "la vía \"a\" no comienza o termina en unva vía \"via\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
@@ -20687,5 +21234,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
 msgid "No tags"
-msgstr ""
+msgstr "Sin etiquetas"
 
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
@@ -20696,29 +21243,31 @@
 msgid "Unconnected nodes without physical tags"
 msgstr ""
+"No sucede, pero para asegurarse. Tal vez la definición de etiquetas no "
+"interesantes cambiarán en el futuro."
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
 msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr ""
+msgstr "Tiene una etiqueta que contiene \"fixme\" o \"FIXME\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
-msgstr ""
+msgstr "Tiene la llave \"nota\" o \"comentario\" o \"descripción\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
-msgstr ""
+msgstr "Tiene la llave \"creado_por\" o \"convertido_por\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
-msgstr ""
+msgstr "Tiene la llave \"revisar\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
-msgstr ""
+msgstr "Tiene la llave \"fuente\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62
@@ -20740,5 +21289,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
 msgid "Untagged ways (commented)"
-msgstr ""
+msgstr "Vías sin etiquetar (comentado)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
@@ -20783,143 +21332,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+msgstr "{0} {1}% de la traza GPS"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+msgstr "Muestra la posición actual en el video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+msgstr "Importar Video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+msgstr "Sincronizar un video frente a esta traza GPS"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+msgstr "Video Remoto"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+msgstr "Elimina el video actual de la capa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+msgstr "reproducir/pausar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+msgstr "Inicia/pausa la reproducción del video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+msgstr "retroceder"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+msgstr "ir n segundos atrás"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "badén de lomo de asno"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr "saltar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+msgstr "salta al momento especificado por gps"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Introduzca un índice de tesela"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "por favor ingrese el código de tiempo GPS"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "avanzar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+msgstr "salta n segundos adelante"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+msgstr "más rápido"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+msgstr "reproducción más rápida"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+msgstr "más lento"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+msgstr "reproducción más lenta"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+msgstr "ciclo"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
-msgstr ""
+msgstr "ciclo de n segundos alrededor de la posición actual"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+msgstr "Mantener centrado"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
-msgstr ""
+msgstr "Seguir el ícono de video automáticamente"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Escalera de paso"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr "Subtítulos"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr "Mostrar subtítulos en el video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+msgstr "Longitud del salto"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+msgstr "Establecer la longitud del salto"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+msgstr "Saltar el video por x milisegundos"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+msgstr "Longitud del ciclo"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20927,19 +21473,18 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:109
 msgid "Unable to find JNA Java library!"
-msgstr ""
+msgstr "¡No se encontró librería JNA de Java!"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:113
 msgid "Unable to find native libvlc library!"
-msgstr ""
+msgstr "¡No se encontró la librería nativa libvlc!"
 
 #. TODO we need Icons instead
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
-msgstr ""
+msgstr "reproducir"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "diversos"
+msgstr "silenciar"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21028,4 +21573,9 @@
 "continue way downloading?</html>"
 msgstr ""
+"<html>No hay vías conectadas adicionales para descargar.<br>Aunque se "
+"encontró un nodo potencialmente duplicado del nodo actualmente seleccionado."
+"<br><br>El nodo actualmente seleccionado es \"{0}\"<br>El nodo "
+"potencialmente duplicado es \"{1}\"<br>Mezclar el nodo duplicado con el nodo "
+"actualmente seleccionado y continuar descargando?</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -21044,31 +21594,30 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Seleccionar dentro de la búsqueda"
+msgstr "Seleccione un punto de vía para mover el mapa"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Nodos de Vía"
+msgstr "Búsqueda de puntos de vía"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
+"Buscar un punto de vía. Mueva la vista de mapa para ver el punto de vía."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:47
 msgid "Way Select"
-msgstr ""
+msgstr "Selección de Vía"
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:46
 msgid "Select non-branching sequences of ways"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+msgstr "Seleccionar secuencias de vías que no se bifurquen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Ocurrió una excepción"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "No en caché"
@@ -21129,21 +21678,21 @@
 msgstr "Ajustar la posición de la capa WMS seleccionada"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Por favor, selecciona la capa WMS a ajustar."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Seleccionar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Inicio de ajuste"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "No existe alctualmente ningua capa WMS que ajustar."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Ninguna capa que ajustar"
@@ -21154,5 +21703,5 @@
 msgstr "Descargar tesela WMS desde {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21162,5 +21711,5 @@
 "Advertencia: La URL ''{0}'' del servicio WMS no finaliza con '&'  o '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21170,10 +21719,10 @@
 "comprueba la configuración de tus preferencias."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Atención: La URL completa es ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21185,5 +21734,5 @@
 "Esto puede dar lugar a unas coordenadas erróneas."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21192,19 +21741,19 @@
 "''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(desactivado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21219,17 +21768,17 @@
 "teselas WMS de todos modos?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Sí, descargar las imágenes"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "¿URL no válida?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21238,58 +21787,83 @@
 "más, o cambie la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Fijar marcador WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Descarga automática"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "No se encontró el objeto mapa."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo"
@@ -21356,15 +21930,14 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
 msgid "Simultaneous connections"
-msgstr ""
+msgstr "Conexiones simultáneas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
 msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
+msgstr "Permitir control remoto(requiere el plugin de control remoto)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
+msgstr "El control remoto solicitó descargar una capa WMS de la siguiente URL:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21420,5 +21993,5 @@
 #: build/specialmessages.java:14
 msgid "town"
-msgstr ""
+msgstr "pueblo"
 
 #. Landuse type used in multipolygons
@@ -21438,5 +22011,5 @@
 #: build/specialmessages.java:16
 msgid "farmland"
-msgstr ""
+msgstr "campo"
 
 #. relation type
@@ -21444,5 +22017,5 @@
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr ""
+msgstr "Calle Asociada"
 
 #. relation type
@@ -21450,5 +22023,5 @@
 msgctxt "Relation type"
 msgid "boundary"
-msgstr ""
+msgstr "frontera"
 
 #. relation type
@@ -21462,5 +22035,5 @@
 msgctxt "Relation type"
 msgid "line"
-msgstr ""
+msgstr "línea"
 
 #. relation type
@@ -21468,5 +22041,5 @@
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr ""
+msgstr "multipolígono"
 
 #. relation type
@@ -21474,5 +22047,5 @@
 msgctxt "Relation type"
 msgid "network"
-msgstr ""
+msgstr "red"
 
 #. relation type
@@ -21480,5 +22053,5 @@
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "transporte_público"
 
 #. relation type
@@ -21486,5 +22059,5 @@
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "restricción"
 
 #. relation type
@@ -21492,5 +22065,5 @@
 msgctxt "Relation type"
 msgid "route"
-msgstr ""
+msgstr "ruta"
 
 #. relation type
@@ -21498,5 +22071,5 @@
 msgctxt "Relation type"
 msgid "site"
-msgstr ""
+msgstr "lugar"
 
 #. relation type
@@ -21504,15 +22077,15 @@
 msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
+msgstr "vía fluvial"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:29
 msgid "All Files"
-msgstr ""
+msgstr "Todos los archivos"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "Attributes"
-msgstr ""
+msgstr "Atributos"
 
 #. Strings in JFileChooser
@@ -21524,30 +22097,30 @@
 #: build/specialmessages.java:32
 msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "Diálogo de elección de archivo para cancelar"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:34
 msgid "Create New Folder"
-msgstr ""
+msgstr "Crear Nuevo Directorio"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:35
 msgid "Delete File"
-msgstr ""
+msgstr "Borrar Fichero"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Enter file name:"
-msgstr ""
+msgstr "Ingrese nombre de fichero:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:38
 msgid "Enter path or folder name:"
-msgstr ""
+msgstr "Ingrese ruta del fichero:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:39
 msgid "Error "
-msgstr ""
+msgstr "Error "
 
 #. Strings in JFileChooser
@@ -21560,85 +22133,85 @@
 #: build/specialmessages.java:41
 msgid "File name:"
-msgstr ""
+msgstr "Nombre de fichero:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:42
 msgid "File Name:"
-msgstr ""
+msgstr "Nombre de Fichero:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:43
 msgid "FileChooser help."
-msgstr ""
+msgstr "Ayuda de elección de fichero"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:44
 msgid "Files"
-msgstr ""
+msgstr "Ficheros"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:45
 msgid "Files of type:"
-msgstr ""
+msgstr "Ficheros de tipo:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:46
 msgid "Files of Type:"
-msgstr ""
+msgstr "Ficheros de tipo:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:48
 msgid "Filter:"
-msgstr ""
+msgstr "Filtro:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:49
 msgid "Folders"
-msgstr ""
+msgstr "Directorios"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:51
 msgid "Home"
-msgstr ""
+msgstr "Inicio"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:52
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:53
 msgid "Look in:"
-msgstr ""
+msgstr "Buscar en:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:54
 msgid "Look In:"
-msgstr ""
+msgstr "Buscar en:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:55
 msgid "Modified"
-msgstr ""
+msgstr "Modificado"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:56
 msgid "New Folder"
-msgstr ""
+msgstr "Nuevo Directorio"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:60
 msgid "Open selected file"
-msgstr ""
+msgstr "Abrir fichero seleccionado"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:61
 msgid "Open selected file."
-msgstr ""
+msgstr "Abrir fichero seleccionado."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:63
 msgid "Rename File"
-msgstr ""
+msgstr "Renombrar fichero"
 
 #. Strings in JFileChooser
@@ -21646,15 +22219,15 @@
 #, java-format
 msgid "Rename file \"{0}\" to"
-msgstr ""
+msgstr "Renombrar fichero \"{0}\" a"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:66
 msgid "Save in:"
-msgstr ""
+msgstr "Guardar en:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:67
 msgid "Save In:"
-msgstr ""
+msgstr "Guardar en:"
 
 #. Strings in JFileChooser
@@ -21666,15 +22239,15 @@
 #: build/specialmessages.java:69
 msgid "Selection:"
-msgstr ""
+msgstr "Selección:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:70
 msgid "Size"
-msgstr ""
+msgstr "Tamaño"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:73
 msgid "Up One Level"
-msgstr ""
+msgstr "Subir un nivel"
 
 #. Strings in JFileChooser
@@ -21686,20 +22259,20 @@
 #: build/specialmessages.java:75
 msgid "Update directory listing."
-msgstr ""
+msgstr "Actualizar listado de directorio."
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:78
 msgid "Blue:"
-msgstr ""
+msgstr "Azul:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:79
 msgid "Color Name:"
-msgstr ""
+msgstr "Nombre e Color:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:80
 msgid "Green:"
-msgstr ""
+msgstr "Verde:"
 
 #. Strings in GTK ColorChooser
@@ -21711,15 +22284,15 @@
 #: build/specialmessages.java:82
 msgid "GTK Color Chooser"
-msgstr ""
+msgstr "Elector de Color GTK"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:83
 msgid "Red:"
-msgstr ""
+msgstr "Rojo:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:84
 msgid "Saturation:"
-msgstr ""
+msgstr "Saturación:"
 
 #. Plugin AddrInterpolation
@@ -21789,5 +22362,5 @@
 #: build/trans_plugins.java:20
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "Descargar datos OSM cercanos a una vía"
 
 #. Plugin Duplicate-Way
@@ -21889,11 +22462,16 @@
 "Java - tablet problem).."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21902,5 +22480,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21910,5 +22488,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21918,5 +22496,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21928,5 +22506,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21937,10 +22515,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21950,15 +22528,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Componente para revertir conjuntos de cambios"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21972,5 +22550,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21982,10 +22560,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21997,5 +22575,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22006,10 +22584,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -22018,5 +22596,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22030,15 +22608,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Crea y editar balizas de navegación para OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22049,5 +22627,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22058,5 +22636,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22067,10 +22645,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Premite desborrar un objeto de la base de datos OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22082,5 +22660,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22088,7 +22666,10 @@
 "objects."
 msgstr ""
+"(Este plugin actualmente es un trabajo en progreso!!!) Enlaza y sincroniza "
+"un video georeferenciado frente a una traza GPS, para identificar los "
+"objetos visibles."
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22099,5 +22680,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22105,15 +22686,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Selecciona una secuencia de vías conectadas no ramificadas"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22124,5 +22705,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22166,4 +22747,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22196,10 +22778,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Viales"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Calles/Carreteras"
@@ -22210,5 +22792,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autopista"
@@ -22217,5 +22799,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Editar autopista"
@@ -22252,10 +22834,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referencia"
@@ -22269,8 +22851,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Carriles"
@@ -22289,13 +22871,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -22329,17 +22911,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Sentido único"
@@ -22376,17 +22958,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22420,17 +23002,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Túnel"
@@ -22461,17 +23043,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Desmonte"
@@ -22502,17 +23084,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Terraplén"
@@ -22520,5 +23102,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Enlace de autopista"
@@ -22527,5 +23109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Editar enlace de autopista"
@@ -22533,5 +23115,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Carretera principal"
@@ -22540,5 +23122,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Editar carretera principal"
@@ -22548,6 +23130,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Autovía"
@@ -22555,5 +23137,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Enlace a carretera principal"
@@ -22562,5 +23144,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Editar enlace a carretera principal"
@@ -22573,5 +23155,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Carretera primaria"
@@ -22580,5 +23162,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Editar carretera primaria"
@@ -22586,10 +23168,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Enlace a carretera primaria"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Editar carretera primaria"
@@ -22601,5 +23183,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Carretera secundaria"
@@ -22609,5 +23191,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Editar carretera secundaria"
@@ -22615,5 +23197,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Carretera local"
@@ -22623,5 +23205,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Editar"
@@ -22633,5 +23215,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Carretera sin clasificación"
@@ -22641,5 +23223,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Editar carretera sin clasificación"
@@ -22649,6 +23231,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Lugares de cruce frecuente de la vía"
@@ -22671,15 +23253,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -22691,5 +23273,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Calle urbana"
@@ -22698,5 +23280,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Editar calle urbana"
@@ -22716,12 +23298,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Superficie"
@@ -22743,166 +23325,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "sin pavimentar"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalto"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "hormigón"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "bosque"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "pavimento adoquinado"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "adoquinado"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "grava"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "grijo"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "compactado"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "pavimento vegetal (de celosía)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "hierba"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "arena"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "tierra"
@@ -22910,5 +23492,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Calle residencial"
@@ -22917,5 +23499,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Editar calle residencial"
@@ -22923,5 +23505,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Calle peatonal"
@@ -22930,5 +23512,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Editar una vía peatonal"
@@ -22936,5 +23518,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Vía de servicio"
@@ -22943,5 +23525,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Editar vía de servicio"
@@ -22951,18 +23533,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Tipo de vía de servicio"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "callejón"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "camino de entrada (a garage, casa, finca, etc.)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "pasillo de aparcamiento"
@@ -22970,5 +23552,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Pasillo de aparcamiento"
@@ -22978,10 +23560,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Editar pasillo de aparcamiento"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipología desconocida)"
@@ -22990,5 +23572,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Editar carretera (tipología desconocida)"
@@ -22996,14 +23578,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "En construcción"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Editar una vía en construcción"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Intersección"
@@ -23019,5 +23601,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rotonda"
@@ -23026,5 +23608,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Restricciones de tráfico"
@@ -23033,15 +23615,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Editar restricciones de tráfico"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Peaje"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Sin salida (cul-de-sac)"
@@ -23049,5 +23631,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Acceso"
@@ -23073,4 +23655,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23078,4 +23661,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23151,236 +23740,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privado"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:219
+msgid "destination"
+msgstr "lugar de 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permisivo"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "agrícola"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "forestal"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "reparto de mercancías"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "no"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Agrícola"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "autorizado"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privado"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "lugar de 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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permisivo"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "agrícola"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "forestal"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "reparto de mercancías"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "no"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Agrícola"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "autorizado"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "oficial"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículos pesados (> 6 t.)"
@@ -23395,10 +23991,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Caballo"
@@ -23414,10 +24010,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -23432,19 +24029,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automóvil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehículos de servicio público (SP)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Velocidad mínima (km/h)"
@@ -23452,20 +24049,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Longitud max. (en metros)"
@@ -23473,5 +24070,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -23482,5 +24079,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -23500,10 +24097,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -23525,10 +24122,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -23550,10 +24147,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -23575,5 +24172,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23588,9 +24185,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "carretera local"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "carretera sin clasificación"
@@ -23604,9 +24201,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "calle urbana"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "calle residencial"
@@ -23650,10 +24247,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -23683,5 +24280,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23693,10 +24290,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Editar un puente"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -23704,10 +24301,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Pista"
@@ -23716,35 +24313,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Editar una pista"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Tipo de pista"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "Grado 1 (pavimentada)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "Grado 2 (de áridos o zahorra)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "Grado 3 (de áridos con vegetación entre rodaduras)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "Grado 4 (de tierra con vegetación entre rodaduras)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "Grado 5 (con rodaduras apenas visibles entre la vegetación)"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Escala MTB"
@@ -23752,5 +24349,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Camino (genérico, sin uso específico)"
@@ -23759,76 +24356,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Editar camino"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Escala SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "senda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "senda de montaña"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "senda de montaña exigente"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "senda alpina"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "senda alpina exigente"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "senda alpina dificil"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "excelente"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "buena"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "intermedia"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "mala"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "pésima"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Sillas de ruedas"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Esquí"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Trineo"
@@ -23837,5 +24434,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Camino de herradura dedicado"
@@ -23843,5 +24440,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Editar vía ecuestre"
@@ -23849,5 +24446,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Carril bici dedicado"
@@ -23865,11 +24462,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Editar vía ciclable"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Peatones"
@@ -23877,5 +24474,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Carril bici y vía peatonal separados"
@@ -23883,5 +24480,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Carril bici y vía peatonal conjuntos"
@@ -23889,5 +24486,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Acera peatonal dedicada"
@@ -23896,5 +24493,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
@@ -23902,5 +24499,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Escaleras"
@@ -23910,10 +24507,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleras"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Número de asientos"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Salida de autopista"
@@ -23921,15 +24524,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Editar salida de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Servicios"
@@ -23937,5 +24540,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -23943,10 +24546,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23975,36 +24579,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operador"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Restaurar"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Editar restaurante"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Teléfono de emergencia"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -24014,5 +24639,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -24021,27 +24646,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "isla"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "sin marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -24049,6 +24674,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -24057,11 +24682,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -24069,30 +24694,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -24100,67 +24725,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Paso peatonal"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Editar cruce"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Tipo de nombre (Reino Unido)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Calmado de tráfico"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Editar calmado de tráfico"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "badén de lomo de asno"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "garganta"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "cojín berlines"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "resalte"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "plataforma elevada"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Lugar de cruce frecuente de la vía"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Editar lugar de cruce frecuente de la vía"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rotonda"
@@ -24171,14 +24734,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "agujas del reloj"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Paso peatonal"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Editar cruce"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Tipo de nombre (Reino Unido)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Calmado de tráfico"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Editar calmado de tráfico"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "badén de lomo de asno"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "garganta"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "cojín berlines"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "resalte"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "plataforma elevada"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Lugar de cruce frecuente de la vía"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Editar lugar de cruce frecuente de la vía"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -24188,5 +24813,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Límite de ciudad"
@@ -24194,15 +24819,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 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:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Rádar de tráfico"
@@ -24211,11 +24836,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Teléfono de emergencia"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Pendiente"
@@ -24223,5 +24843,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Pendiente pronunciada"
@@ -24229,5 +24849,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Contenedor de gravilla"
@@ -24237,10 +24857,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Vado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -24248,5 +24868,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Puerto de montaña"
@@ -24254,5 +24874,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Editar puerto de montaña"
@@ -24261,10 +24881,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Altitud"
@@ -24272,5 +24892,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barreras"
@@ -24278,5 +24898,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Bolardo"
@@ -24284,5 +24904,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -24327,16 +24947,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Barrera para bicicletas"
@@ -24345,5 +24965,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Bloques"
@@ -24351,5 +24971,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Barrera canadiense"
@@ -24357,10 +24977,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Editar barrera canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -24368,15 +24988,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Resorte con pinchos (para el control de acceso unidireccional)"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Editar resorte con pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Cabina de peaje"
@@ -24384,5 +25004,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaje"
@@ -24390,10 +25010,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -24402,5 +25022,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Seto"
@@ -24411,22 +25031,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Valla o cerca"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "valla"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "valla_de_madera"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "valla_de_alambre"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Muro"
@@ -24434,5 +25054,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Muralla"
@@ -24441,5 +25061,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -24450,10 +25070,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Editar una entrada"
@@ -24461,5 +25081,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Puerta"
@@ -24467,30 +25087,30 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Editar puerta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Barrera"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Editar una barrera"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
@@ -24498,20 +25118,20 @@
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Editar puerta de golpe"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Escalera de paso"
@@ -24519,25 +25139,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Editar una escalera de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Torno"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Editar torno"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -24545,25 +25165,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Fuente"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Editar fuente"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Desagüe"
@@ -24571,10 +25180,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Acequia"
@@ -24582,10 +25191,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Editar acequia"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Arroyo o riachuelo"
@@ -24593,10 +25202,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "editar arroyo o riachuelo"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Canal"
@@ -24604,10 +25213,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Río"
@@ -24617,59 +25226,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Editar un río"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Fuente"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Editar fuente"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Cascada"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Editar una cascada"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Represa"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Editar una represa"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Presa"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Editar una presa"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Cuenca"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Editar cuenca"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Embalse"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Editar embalse"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Depósito de agua"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Editar depósito de agua"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Suelo"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Editar suelo"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Cuenca"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Editar cuenca"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Embalse"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Editar embalse"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Depósito de agua"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Editar depósito de agua"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Línea de costa"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Editar línea de costa"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Ribera (para orillas de ríos anchos)"
@@ -24678,10 +25341,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Pantano"
@@ -24692,14 +25356,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "ciénaga"
@@ -24713,35 +25377,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Playa"
@@ -24749,20 +25413,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Bahía"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Acantilado"
@@ -24770,145 +25434,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Línea de costa"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Editar línea de costa"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Compras"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Terminal de ferry"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Editar la terminal de ferry"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Coche"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "novato"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicicleta"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Astillero"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Editar un astillero"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Muelle"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Editar un muelle"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Presa"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Editar una presa"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Nodo en vía fluvial"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Puerto deportivo"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Editar puerto deportivo"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Embarcadero"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Editar embarcadero"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Esclusa"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Represa"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Editar una represa"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Cascada"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Editar una cascada"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Ensanche para giro"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Puerto deportivo"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Editar puerto deportivo"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Embarcadero"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Editar embarcadero"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Terminal de ferry"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Editar la terminal de ferry"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Rampa"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24918,16 +25653,38 @@
 msgstr "Editar rampa"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Astillero"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Editar un astillero"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Muelle"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Editar un muelle"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Vía de tren"
@@ -24935,5 +25692,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -24963,7 +25720,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24979,8 +25736,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Tipos"
@@ -24994,29 +25751,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "vía muerta"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Electrificado"
@@ -25029,8 +25786,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -25101,8 +25858,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25114,8 +25871,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltaje"
@@ -25128,8 +25885,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frecuencia (Hz)"
@@ -25142,23 +25899,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Vía estrecha"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estrecha"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -25166,50 +25923,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Metro ligero"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Editar metro ligero"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Editar metro"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -25217,5 +25974,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -25224,10 +25981,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
@@ -25236,9 +25993,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Tipos opcionales"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -25247,5 +26004,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -25254,5 +26011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -25262,5 +26019,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -25268,5 +26025,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -25275,5 +26032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Tope de vía"
@@ -25282,10 +26039,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -25293,10 +26050,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -25304,10 +26061,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -25315,10 +26072,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Góndola"
@@ -25326,10 +26083,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Editar góndola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25338,5 +26096,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25344,5 +26102,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25351,5 +26109,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25357,5 +26115,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -25365,69 +26123,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "tierra"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "Incremento"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25444,34 +26225,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25479,37 +26261,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Horario de apertura"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25530,33 +26323,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25565,170 +26360,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr ""
-
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+msgstr "Ma-Sa 08:00-15:00;Sa 08:00-12:00"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "Con quiosco"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Tienda de alimentación"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosco"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Tipos de combustible:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
+msgstr "Diesel (Gas a Liquido - ultmate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
+msgstr "Diesel para Vehículos pesados y buenos"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 octanos"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 octanos"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 octanos"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 octanos"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mezcla al 10% de etanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mezcla al 85% de etanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (Gas licuado de petróleo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
-msgstr ""
+msgstr "GNC (Gas Natural Comprimido)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -25736,4 +26553,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25745,6 +26563,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Aparcamiento"
@@ -25753,5 +26571,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -25762,25 +26580,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "al aire libre"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Aparcamiento disuasorio (Park & Ride)"
@@ -25789,54 +26609,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "De pago"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Capacidad (en general)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Espacios para la mujer"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Espacios para padres"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Concesionario de automóviles"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Editar concesionario de automóviles"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Taller"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Tipos"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Editar árbol"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Contenido"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Número de fax"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Sitio web"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Correo electrónico"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Alquiler"
@@ -25845,10 +26809,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Compartido"
@@ -25856,28 +26819,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Editar aparcamiento para bicicletas"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacidad (Coches)"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocicleta"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Editar autopista"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Servicios"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Escalar"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "mala"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Predefinidos"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Ropas"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacidad (Coches)"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Tienda de bicicletas"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Editar tienda de bicicletas"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25887,5 +26909,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25893,5 +26915,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -25899,5 +26921,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -25905,5 +26927,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -25911,5 +26933,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -25918,5 +26940,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -25924,5 +26946,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -25931,5 +26953,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -25941,5 +26963,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -25947,10 +26969,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -25959,10 +26981,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -25971,5 +26993,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -25978,5 +27000,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -25984,5 +27006,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -25992,13 +27014,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Refugio"
@@ -26006,19 +27027,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Pavimento táctil"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -26026,5 +27047,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -26032,5 +27053,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -26038,10 +27059,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aeropuerto"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Campo de aviación"
@@ -26049,5 +27070,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Editar campo de aviación"
@@ -26055,10 +27076,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -26067,5 +27088,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Pista"
@@ -26073,5 +27094,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Editar pista"
@@ -26079,5 +27100,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Pista de rodaje"
@@ -26085,5 +27106,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Editar pista de rodaje"
@@ -26091,5 +27112,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Pista de aterrizaje de helicópteros"
@@ -26097,5 +27118,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Editar pista de aterrizaje de helicópteros"
@@ -26105,5 +27126,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Plataforma de estacionamiento"
@@ -26113,5 +27134,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -26122,6 +27143,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Baliza"
@@ -26131,5 +27152,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Manga de viento"
@@ -26138,5 +27159,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -26144,5 +27165,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Editar Terminal"
@@ -26150,15 +27171,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Editar Puerta de Terminal"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Turismo"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -26170,5 +27191,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -26177,5 +27198,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Editar hotel"
@@ -26188,8 +27209,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Estrellas"
@@ -26213,36 +27234,36 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "Acceso a Internet"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "inalámbrica"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
-msgstr ""
+msgstr "con cable"
 
 #. color aeroway
@@ -26254,168 +27275,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
-msgstr ""
+msgstr "Costo del acceso a Internet"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "Fumadores"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "dedicado"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "separado"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
-msgstr ""
-
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
+msgstr "aislado"
 
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26423,20 +27349,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Cabaña o bungalow"
@@ -26444,10 +27370,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Editar cabaña o bungalow"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Albergue"
@@ -26455,30 +27381,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -26486,10 +27413,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -26500,5 +27427,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -26506,5 +27433,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -26512,5 +27439,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cocina"
@@ -26518,79 +27447,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "francés"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich / emparedado"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -26598,18 +27527,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish_and_chips (papas y pescado fritos)"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "pollo"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26617,10 +27546,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Cafetería"
@@ -26628,10 +27557,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -26639,20 +27573,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Editar pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -26660,10 +27594,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Discoteca"
@@ -26671,25 +27605,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Editar discoteca"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museo"
@@ -26697,9 +27631,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -26708,9 +27642,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Parque temático"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Editar parque temático"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Trabajo artístico"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Editar trabajo artístico"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -26718,50 +27673,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Parque temático"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Editar parque temático"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Trabajo artístico"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Editar trabajo artístico"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Editar refugio"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Barbacoa"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Zona de picnic"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Editar zona de picnic"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topográfico"
@@ -26799,5 +27755,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26805,28 +27761,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "sitio"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "ciudad"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "región"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -26836,5 +27792,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -26842,5 +27798,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Sendero"
@@ -26848,6 +27804,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -26855,5 +27811,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -26861,6 +27817,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Esquí"
@@ -26868,5 +27824,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Equitación"
@@ -26874,46 +27830,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... otros modos de desplazamiento posible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr "Asta de bandera"
@@ -26922,5 +27878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -26928,55 +27884,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Editar refugio"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Barbacoa"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Zona de picnic"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Editar zona de picnic"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Castillo"
@@ -26985,19 +27920,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -27006,9 +27941,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -27016,10 +27951,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Sitio paleontológico"
@@ -27027,5 +27962,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontológico"
@@ -27033,15 +27968,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -27049,55 +27984,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -27105,35 +28040,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -27147,6 +28082,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -27562,6 +28497,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27596,240 +28531,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "fútbol_americano"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "fútbol_canadiense"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "fútbol_galo"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "liga_de_rugby"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "unión_de_rugby"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Cancha de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Editar cancha de juego"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -27846,5 +28781,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27871,23 +28805,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tipo"
@@ -27904,5 +28846,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27929,211 +28870,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "cancha de juego"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Deportes de motor"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Editar deportes de motor"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -28141,52 +29085,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Tiro"
@@ -28194,204 +29138,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
-msgstr ""
+msgstr "Fútbol Americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
-msgstr ""
-
-#: build/trans_presets.java:2268
+msgstr "Editar fútbol americano"
+
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
-msgstr ""
+msgstr "Fútbol canadiense"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
-msgstr ""
-
-#: build/trans_presets.java:2274
+msgstr "Editar fútbol canadiense"
+
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
-msgstr ""
+msgstr "Fútbol galo"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
-msgstr ""
-
-#: build/trans_presets.java:2280
+msgstr "Editar fútbol galo"
+
+#: build/trans_presets.java:2357
 msgid "Rugby League"
-msgstr ""
+msgstr "Liga de Rugby"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
-msgstr ""
-
-#: build/trans_presets.java:2286
+msgstr "Editar Liga de Rugby"
+
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
-msgstr ""
+msgstr "Unión de Rugby"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
-msgstr ""
-
-#: build/trans_presets.java:2292
+msgstr "Editar Unión de Rugby"
+
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Deportes de motor"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Editar deportes de motor"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Atención"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Editar aparcamiento"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Turismos"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Editar deportes de motor"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Editar patinaje"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Editar aduana"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Coche"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Ediatr telecabina"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Edificio"
@@ -28399,5 +29409,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Edificio público"
@@ -28405,10 +29415,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -28416,10 +29426,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Embajada"
@@ -28427,10 +29437,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -28439,10 +29449,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Prisión"
@@ -28451,10 +29461,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Policía"
@@ -28464,10 +29474,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -28476,10 +29486,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -28487,5 +29497,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -28493,15 +29503,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Escuela"
@@ -28509,10 +29519,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universidad"
@@ -28520,10 +29530,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -28531,5 +29541,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -28537,5 +29547,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cine"
@@ -28544,10 +29554,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Biblioteca"
@@ -28556,9 +29566,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -28566,10 +29576,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teatro"
@@ -28578,10 +29588,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -28591,5 +29601,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -28598,6 +29608,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religión"
@@ -28606,66 +29616,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Confesión"
@@ -28674,189 +29684,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "suní"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Editar direcciones"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Número de portal"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nombre del edificio"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nombre de la calle"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Nombre de la ciudad"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Código postal"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Código del país"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Editar interpolación de números de portales"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Esquema numérico"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "impares"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "pares"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabético"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -28864,25 +29804,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Faro"
@@ -28890,10 +29830,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -28901,10 +29841,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Tubería"
@@ -28913,41 +29853,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "cualquier sustancia"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "en superficie"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -28957,10 +29897,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Grúa"
@@ -28968,5 +29908,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -28974,10 +29914,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -28985,10 +29925,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -28996,23 +29936,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -29022,35 +29962,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -29059,10 +29999,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -29071,5 +30011,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -29077,10 +30017,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -29091,23 +30031,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Referencia de la torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -29116,76 +30056,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2638
+msgstr "Línea"
+
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr ""
+msgstr "baja tensión"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Teléfono"
@@ -29194,5 +30134,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -29200,5 +30140,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Monedas"
@@ -29206,5 +30146,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Billetes"
@@ -29212,5 +30152,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -29218,5 +30158,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -29224,15 +30164,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -29241,5 +30181,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -29247,35 +30187,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Envases"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Ropas"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Papeleras"
@@ -29283,5 +30218,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Editar papeleras"
@@ -29290,31 +30225,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marrón"
@@ -29393,5 +30328,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29401,31 +30336,31 @@
 msgstr "zona verde"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -29433,31 +30368,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fuente"
@@ -29466,10 +30401,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -29478,10 +30413,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -29490,5 +30425,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -29496,502 +30431,504 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Pie"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermercado"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Editar supermercado"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Tienda de alimentación"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Editar tienda de alimentación"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosco"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Editar kiosco"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Carnicería"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Editar carnicería"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Panadería"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Editar panadería"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Tienda de productos orgánicos"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Editar tienda de productos orgánicos"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Tienda de bebidas alcohólicas"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Editar tienda de bebidas alcohólicas"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Bebidas"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Editar tienda de bebidas"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Comercios"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Farmacia"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Editar farmacia"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Peluquería"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Editar peluquería"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Óptica"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Editar óptica"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Editar tienda de informática"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Zapatos"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Editar zapatería"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Tienda de actividades al aire libre"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Editar tienda de actividades al aire libre"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Editar tienda de material de deportes"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Tintorería"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Editar tintorería"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Lavandería"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Editar lavandería"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "paso con más de un cruce ferroviario"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Ediar vía de tren"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Tienda de informática"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Editar tienda de informática"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Electrónica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Editar tienda de electrónica"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hi-Fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Editar tienda Hi-Fi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Editar tienda de videos"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Floristería"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Editar floristería"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Centro de jardinería"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Editar centro de jardinería"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Ferretería"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Editar ferretería"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Almacén de bricolaje"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Editar almacén de bricolaje"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Muebles"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Editar mueblería"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Papelería"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Editar papelería"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Librería"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Editar librería"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Agencia de viajes"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Editar agencia de viajes"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Juguetes"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Editar juguetería"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Máquina expendedora"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Editar máquina expendedora"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Expendedor automático de productos"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "billetes de de transporte público"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "abonos de transporte público"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "billetes de aparcamiento"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "Alimentación"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "Bebidas"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "Caramelos"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "Estanco"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "comida para animales"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "Periódicos"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "juguetes"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "sellos"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "Tarjetas SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "Tarjetas telefónicas"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "Bonos"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "condones"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampones"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "Bolsas para excrementos"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+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:3045
+msgid "Cash"
+msgstr "Dinero en efectivo"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banco"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Editar banco"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Cajero automático"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Cambio de moneda"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Editar cambio de moneda"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Editar cajero automático"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Centro médico"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr ""
+"Médicos (para centros de tratamiento ambulatorio y reconocimiento médico)"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Editar médicos"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dentista"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Editar dentista"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Farmacia/Parafarmacia"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Editar farmacia/parafarmacia"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Expende con receta médica"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hospital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Editar hospital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Caja tibia"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Comercios"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Concesionario de automóviles"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Editar concesionario de automóviles"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Tienda de bicicletas"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Editar tienda de bicicletas"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermercado"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Editar supermercado"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Farmacia"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Editar farmacia"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Tienda de alimentación"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Editar tienda de alimentación"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosco"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Editar kiosco"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Librería"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Editar librería"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Agencia de viajes"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Editar agencia de viajes"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Carnicería"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Editar carnicería"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Panadería"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Editar panadería"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Floristería"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Editar floristería"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Tienda de productos orgánicos"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Editar tienda de productos orgánicos"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Tienda de bebidas alcohólicas"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Editar tienda de bebidas alcohólicas"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Bebidas"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Editar tienda de bebidas"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Tienda de informática"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Editar tienda de informática"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Electrónica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Editar tienda de electrónica"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hi-Fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Editar tienda Hi-Fi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Muebles"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Editar mueblería"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Centro de jardinería"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Editar centro de jardinería"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Ferretería"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Editar ferretería"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Almacén de bricolaje"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Editar almacén de bricolaje"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Papelería"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Editar papelería"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Peluquería"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Editar peluquería"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Zapatos"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Editar zapatería"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Juguetes"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Editar juguetería"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Editar tienda de videos"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Tintorería"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Editar tintorería"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Lavandería"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Editar lavandería"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Tienda de actividades al aire libre"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Editar tienda de actividades al aire libre"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Editar tienda de material de deportes"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Óptica"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Editar óptica"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Máquina expendedora"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Editar máquina expendedora"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Expendedor automático de productos"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "billetes de de transporte público"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "abonos de transporte público"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "billetes de aparcamiento"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "Alimentación"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "Bebidas"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "Caramelos"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "Estanco"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "comida para animales"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "Periódicos"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "juguetes"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "sellos"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "Tarjetas SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "Tarjetas telefónicas"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "Bonos"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "condones"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampones"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "Bolsas para excrementos"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-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:2955
-msgid "Cash"
-msgstr "Dinero en efectivo"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banco"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Editar banco"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Cajero automático"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Cambio de moneda"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Editar cambio de moneda"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Editar cajero automático"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Centro médico"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr ""
-"Médicos (para centros de tratamiento ambulatorio y reconocimiento médico)"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Editar médicos"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dentista"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Editar dentista"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Farmacia/Parafarmacia"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Editar farmacia/parafarmacia"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Expende con receta médica"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hospital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Editar hospital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -30000,5 +30937,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -30007,15 +30944,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -30023,5 +30960,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -30030,91 +30967,147 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografía"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Fronteras"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nacional"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Editar frontera nacional"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrativa"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Editar frontera administrativa"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Editar frontera civil"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Político"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Editar frontera política"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parque Nacional"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Editar límites del parque nacional"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Lugares"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continente"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Editar continente"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "País"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Editar país"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Estado/Provincia"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Región"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Editar región"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Municipio"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Editar municipio"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr ""
@@ -30122,7 +31115,7 @@
 "distritos, etc.)"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr ""
@@ -30130,22 +31123,22 @@
 "viviendas, distritos, etc.)"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr ""
 "Poblamiento laxo (pequeños barrios, aldeas, caseríos, urbanizaciones, etc.)"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr ""
@@ -30153,252 +31146,202 @@
 "etc.)"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Paraje"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Pico"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Editar pico"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glaciar"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Editar glaciar"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Volcán"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Editar volcán"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Entrada de cueva"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Editar entrada de cueva"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Isla"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Editar isla"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Islote"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Editar islote"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "naturaleza"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Árbol"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Editar árbol"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Nombre botánico"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Bosque"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Editar bosque"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "conífera"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "caducifolio"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "mixto"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Plantación forestal"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Editar zona forestal"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Reserva natural"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Editar reserva natural"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Entrada de cueva"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Editar entrada de cueva"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Pico"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Editar pico"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glaciar"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Editar glaciar"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Volcán"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Editar volcán"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Fronteras"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nacional"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Editar frontera nacional"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrativa"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Editar frontera administrativa"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Editar frontera civil"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Político"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Editar frontera política"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parque Nacional"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Editar límites del parque nacional"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Pedregal"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Editar pedregal"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Braña"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Editar braña"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Matorral"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Editar matorral"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Brezal o landa"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Editar brezal o landa"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Árbol"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Editar árbol"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Nombre botánico"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Bosque"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Editar bosque"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "conífera"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "caducifolio"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "mixto"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Plantación forestal"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Editar zona forestal"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Reserva natural"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Editar reserva natural"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Pedregal"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Editar pedregal"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Matorral"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Editar matorral"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Braña"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Editar braña"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Brezal o landa"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Editar brezal o landa"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -30407,45 +31350,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -30453,15 +31396,15 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr ""
@@ -30470,10 +31413,10 @@
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Editar zonas con hierba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -30483,10 +31426,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -30494,20 +31437,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -30515,5 +31458,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -30521,15 +31464,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Camposanto (para los cementerios próximos a las iglesias)"
@@ -30537,9 +31480,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -30547,39 +31490,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -30587,15 +31530,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -30603,52 +31546,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Estación"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Direcciones"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Editar direcciones"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Número de portal"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nombre del edificio"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nombre de la calle"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Nombre de la ciudad"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Código postal"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Código del país"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Editar interpolación de números de portales"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Esquema numérico"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "impares"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "pares"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabético"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Contenido"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Añadir información del autor"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Imagen"
 
 #. item "Relations/Multipolygon"
@@ -30656,5 +31732,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -30666,5 +31742,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -30672,5 +31748,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "segmento interior"
@@ -30678,5 +31754,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Frontera"
@@ -30687,5 +31763,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Editar frontera"
@@ -30693,42 +31769,42 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Tipo de frontera"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administrativa"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
-msgstr ""
-
-#: build/trans_presets.java:3416
+msgstr "nacional"
+
+#: build/trans_presets.java:3551
 msgid "civil"
-msgstr ""
-
-#: build/trans_presets.java:3416
+msgstr "civil"
+
+#: build/trans_presets.java:3551
 msgid "political"
-msgstr ""
-
-#: build/trans_presets.java:3417
+msgstr "político"
+
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
-msgstr ""
+msgstr "Subárea"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
-msgstr ""
+msgstr "Centro administrativo"
 
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -30737,5 +31813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -30743,34 +31819,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "solo ir recto"
@@ -30779,15 +31855,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 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:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "a la vía"
@@ -30795,5 +31871,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Ruta"
@@ -30802,5 +31878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -30808,132 +31884,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Tipo de ruta"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicicleta"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -31001,5 +31966,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31009,9 +31974,9 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "desvío"
@@ -31025,10 +31990,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -31036,31 +32001,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -31069,30 +32034,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -35070,7 +36035,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35192,8 +36156,46 @@
 msgstr "Sicilia - Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Conservar archivos de copia de seguridad"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr "No puede alinear segmentos conectados."
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "<li><b>Alinear los segmentos.</b> Presione <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. También puede encontrar la orden en el menú de "
+#~ "<b>Herramientas</b>\n"
+#~ "o puede colocar la acción en la <b>barra de herramientas</b>.\n"
+#~ "</li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Nodo en vía fluvial"
 
 #~ msgid "Move"
@@ -35243,7 +36245,4 @@
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "No hay hora para el punto {0} x {1}"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 22859)
+++ applications/editors/josm/i18n/po/et.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-16 13:59+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-24 09:32+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-08-20 19:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Hoiatus"
@@ -122,9 +122,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap redaktor"
@@ -132,5 +132,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -275,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -298,5 +298,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -405,4 +405,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1042,5 +1043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1049,5 +1050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1060,5 +1061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "Viide"
@@ -1443,13 +1444,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1458,5 +1459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1464,9 +1465,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Lisa valikusse"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1474,5 +1475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1506,8 +1507,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1516,9 +1517,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1534,6 +1535,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1543,5 +1544,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1566,6 +1567,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Viga"
@@ -1725,5 +1726,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Ei, katkesta"
@@ -2007,5 +2008,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2469,5 +2470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2508,18 +2509,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2777,5 +2778,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Otsi"
@@ -2965,7 +2966,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3227,5 +3228,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3379,31 +3380,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3422,15 +3423,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3439,5 +3440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3446,5 +3447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3453,5 +3454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3460,5 +3461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3466,5 +3467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3473,5 +3474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3480,5 +3481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3487,5 +3488,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3494,10 +3495,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3617,5 +3618,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3687,9 +3688,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3697,5 +3698,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3885,14 +3886,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Teave"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Hüpe sinna"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3917,9 +3937,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3962,5 +3982,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr ""
@@ -3981,5 +4001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4234,69 +4254,69 @@
 msgstr "Salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4306,9 +4326,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4316,57 +4336,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Varaste lIsandprogrammidl laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Loon kasutajaliidest"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "LIsandprogrammide  laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Deebetkaart"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4376,9 +4405,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4392,9 +4421,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4516,23 +4546,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4623,5 +4653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4629,17 +4659,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4649,25 +4679,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5062,4 +5092,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5142,4 +5173,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5156,4 +5188,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5227,5 +5260,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5237,10 +5270,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "kõik"
@@ -5322,5 +5355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5332,5 +5365,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5365,17 +5398,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5383,15 +5416,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5399,10 +5432,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5414,5 +5447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5424,5 +5457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5565,5 +5598,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5677,5 +5710,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5683,5 +5716,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5689,5 +5722,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5695,5 +5728,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5701,5 +5734,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5708,5 +5741,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5714,5 +5747,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5720,5 +5753,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5726,24 +5759,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5764,5 +5797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5787,37 +5820,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Lisa koordinaadid uuele sõlmele."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Kasuta kraade kümnendsüsteemis."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatiivsed väärtused märgivad lääne/lõunapoolkera."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Palun sisesta sobiv laiuskraad vahemikus -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Palun sisesta laiuskraad vahemikus -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Palun sisesta sobiv pikkuskraad vahemikus -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Palun sisesta pikkuskraad vahemikus -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Sulge dialoog ja loo uus sõlm"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Sule dialoog, ära loo uut sõlme"
@@ -5873,9 +5906,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Seosed"
@@ -5923,10 +5956,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5946,37 +5979,37 @@
 msgstr "Ava valiku nimekirja aken."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Suurenda valikule"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Suurenda valitud elementidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5985,27 +6018,27 @@
 msgstr "Valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6013,5 +6046,5 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
@@ -6288,13 +6321,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6406,4 +6439,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6422,6 +6459,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6439,8 +6474,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6451,4 +6493,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6463,33 +6511,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6513,12 +6550,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6590,10 +6637,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6623,8 +6674,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6687,6 +6734,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6739,4 +6784,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6801,32 +6858,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6835,6 +6900,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6843,24 +6910,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6875,82 +6932,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7031,155 +7088,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nimi"
@@ -7603,4 +7665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<erinev>"
@@ -8105,17 +8168,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8391,4 +8454,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8396,15 +8460,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr ""
@@ -8423,16 +8487,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "tundmatu"
@@ -8997,5 +9061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9218,20 +9282,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr ""
@@ -9678,11 +9742,6 @@
 msgstr[1] "{0} objekti kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9690,5 +9749,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9696,5 +9756,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -9704,23 +9764,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Menüü: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -9729,5 +9792,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -9736,10 +9800,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9749,10 +9826,10 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9763,7 +9840,7 @@
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9771,10 +9848,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9782,10 +9859,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9793,21 +9870,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9817,9 +9894,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9827,5 +9904,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9833,30 +9910,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9864,5 +9941,5 @@
 msgstr "Kohanda värvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9871,5 +9948,5 @@
 msgstr "Vaikimisi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9878,18 +9955,18 @@
 msgstr "Vali värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Heli import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9899,23 +9976,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Piltide import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10348,15 +10425,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11289,4 +11366,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Andmekiht {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11369,5 +11489,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr ""
@@ -11386,16 +11506,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr ""
@@ -11429,12 +11549,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr ""
@@ -11680,18 +11800,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12006,26 +12126,18 @@
 msgstr "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12141,6 +12253,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "täiendav"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12357,12 +12478,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12542,5 +12655,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12549,49 +12662,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12601,15 +12714,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12619,17 +12732,17 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13235,5 +13348,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13331,5 +13444,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13338,5 +13451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13405,5 +13518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13413,10 +13526,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13424,5 +13537,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13430,5 +13543,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13436,10 +13549,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13447,5 +13560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13453,5 +13566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13459,5 +13572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13466,10 +13579,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Puudulik <member> määratlus ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13477,9 +13590,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13487,11 +13600,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Keelatud objekti number id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13503,8 +13616,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13518,5 +13631,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13524,5 +13637,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13531,6 +13644,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13542,6 +13655,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13550,5 +13663,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13556,5 +13669,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13562,12 +13675,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13575,5 +13688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13583,5 +13696,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13591,5 +13704,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13597,17 +13710,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Valmistan ette OSM andmeid..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14103,11 +14216,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14116,16 +14229,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14134,5 +14247,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14153,13 +14266,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Ära tee midagi"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Teata veast"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14168,9 +14281,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Ootamatu erandolukord"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14178,5 +14291,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14184,5 +14297,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14191,5 +14304,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14197,9 +14310,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Tekst on juba kopeeritud clipboardi.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14393,5 +14506,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14444,5 +14557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14455,5 +14568,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14463,5 +14576,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14472,5 +14585,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Vihje: Kiirkorraldusi saad muuta seadete alt..)"
@@ -14571,5 +14684,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14655,10 +14768,60 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Avatud"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Muuda kuni {0} objekti seadeid"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Vali"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Kaart: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Tööriist {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+msgid "open end"
+msgstr ""
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -14830,51 +14993,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Sõlme ei saa lisada maailmast väljapoole."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameeter ''{0}'' ei tohi olla tühi"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameeter ''{0}'' ei tohi olla tühi"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14973,16 +15138,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -14996,5 +15153,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15107,5 +15264,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Ehitised"
@@ -15342,5 +15499,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15755,8 +15912,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15870,6 +16023,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Tühi kiht"
@@ -17221,7 +17374,7 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
-msgstr "Avalik transport"
+msgstr "Ühistransport"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:409
@@ -17263,48 +17416,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17313,34 +17470,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17563,58 +17720,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17898,11 +18055,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Vali torustik"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -18979,5 +19135,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -19075,9 +19231,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:113
 msgid "Overlapping highways (with area)"
-msgstr ""
+msgstr "Kattuvad maanteed (aladega)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:118
 msgid "Overlapping railways (with area)"
-msgstr ""
+msgstr "Kattuvad raudteed (alaga)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:123
@@ -19087,9 +19243,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:129
 msgid "Overlapping highways"
-msgstr ""
+msgstr "Kattuvad maanteed"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:134
 msgid "Overlapping railways"
-msgstr ""
+msgstr "Kattuvad raudteed"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:139
@@ -19097,59 +19253,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19628,141 +19784,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "Üles"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19782,7 +19937,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "Arvuti"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19896,9 +20050,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -19957,21 +20111,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -19982,5 +20136,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -19989,5 +20143,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -19995,10 +20149,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20007,24 +20161,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20035,75 +20189,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ava tühi WMS kiht andmete laadimiseks failist"
@@ -20662,16 +20840,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20679,5 +20862,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20685,5 +20868,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20692,5 +20875,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20699,10 +20882,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20710,15 +20893,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20728,5 +20911,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20735,10 +20918,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20747,5 +20930,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20754,15 +20937,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20772,15 +20955,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20789,5 +20972,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20796,5 +20979,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20803,10 +20986,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20815,5 +20998,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20823,5 +21006,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20830,20 +21013,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20852,5 +21035,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20892,4 +21075,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20922,10 +21106,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
-msgstr ""
+msgstr "Maanteed"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Tänavad"
@@ -20936,5 +21120,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -20943,5 +21127,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr ""
@@ -20978,10 +21162,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr ""
@@ -20995,8 +21179,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Rajad"
@@ -21015,13 +21199,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -21055,17 +21239,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Ühesuunaline"
@@ -21102,17 +21286,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21146,17 +21330,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -21187,17 +21371,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr ""
@@ -21228,17 +21412,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr ""
@@ -21246,5 +21430,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr ""
@@ -21253,5 +21437,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr ""
@@ -21259,5 +21443,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr ""
@@ -21266,5 +21450,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr ""
@@ -21274,6 +21458,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21281,5 +21465,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr ""
@@ -21288,5 +21472,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr ""
@@ -21299,5 +21483,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -21306,5 +21490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr ""
@@ -21312,10 +21496,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr ""
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -21327,5 +21511,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -21335,5 +21519,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr ""
@@ -21341,5 +21525,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr ""
@@ -21349,5 +21533,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -21359,5 +21543,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -21367,5 +21551,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -21375,6 +21559,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21397,15 +21581,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21417,5 +21601,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Tänav"
@@ -21424,5 +21608,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr ""
@@ -21442,12 +21626,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr ""
@@ -21469,166 +21653,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "mets"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21636,5 +21820,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -21643,5 +21827,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -21649,5 +21833,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr ""
@@ -21656,5 +21840,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -21662,5 +21846,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Teenindus"
@@ -21669,5 +21853,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr ""
@@ -21677,18 +21861,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21696,5 +21880,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -21704,10 +21888,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -21716,5 +21900,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -21722,14 +21906,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr ""
@@ -21745,5 +21929,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr ""
@@ -21752,5 +21936,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr ""
@@ -21759,15 +21943,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -21775,5 +21959,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr ""
@@ -21799,4 +21983,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21804,4 +21989,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21877,236 +22068,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr ""
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr ""
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr ""
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22121,10 +22319,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr ""
@@ -22140,10 +22338,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr ""
@@ -22158,19 +22357,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -22178,20 +22377,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22199,5 +22398,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr ""
@@ -22208,5 +22407,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr ""
@@ -22226,10 +22425,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -22251,10 +22450,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22276,10 +22475,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22301,5 +22500,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22314,9 +22513,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr ""
@@ -22330,9 +22529,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr ""
@@ -22376,10 +22575,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22409,5 +22608,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22419,10 +22618,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr ""
@@ -22430,10 +22629,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Teed"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22442,35 +22641,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22478,5 +22677,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr ""
@@ -22485,76 +22684,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr ""
@@ -22563,5 +22762,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22569,5 +22768,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -22575,5 +22774,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22591,11 +22790,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22603,5 +22802,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22609,5 +22808,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22615,5 +22814,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22622,5 +22821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr ""
@@ -22628,5 +22827,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr ""
@@ -22636,10 +22835,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr ""
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Istekohtade arv"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr ""
@@ -22647,15 +22852,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr ""
@@ -22663,5 +22868,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -22669,10 +22874,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22701,36 +22907,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operaatorfirma"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "oja"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Vali teater"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr ""
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr ""
@@ -22740,5 +22967,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -22747,27 +22974,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22775,6 +23002,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22783,11 +23010,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22795,30 +23022,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr ""
@@ -22826,67 +23053,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr ""
@@ -22897,14 +23062,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr ""
@@ -22914,5 +23141,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Linnapiiri märk"
@@ -22920,15 +23147,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr ""
@@ -22937,11 +23164,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr ""
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22949,5 +23171,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -22955,5 +23177,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -22963,10 +23185,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr ""
@@ -22974,5 +23196,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr ""
@@ -22980,5 +23202,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -22987,10 +23209,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr ""
@@ -22998,5 +23220,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr ""
@@ -23004,5 +23226,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23010,5 +23232,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23053,16 +23275,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23071,5 +23293,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23077,5 +23299,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23083,10 +23305,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23094,15 +23316,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr ""
@@ -23110,5 +23332,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr ""
@@ -23116,10 +23338,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr ""
@@ -23128,5 +23350,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr ""
@@ -23137,22 +23359,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr ""
@@ -23160,5 +23382,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr ""
@@ -23167,5 +23389,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23176,10 +23398,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr ""
@@ -23187,5 +23409,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr ""
@@ -23193,50 +23415,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23244,25 +23466,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23270,25 +23492,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
-msgstr ""
+msgstr "Vesi"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr ""
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr ""
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr ""
@@ -23296,10 +23507,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23307,10 +23518,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr ""
@@ -23318,10 +23529,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr ""
@@ -23329,10 +23540,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr ""
@@ -23342,59 +23553,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
+msgstr ""
+
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr ""
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr ""
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Kosk"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Kose muutmine"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr ""
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr ""
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr ""
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
-msgstr ""
+msgstr "Vee muutmine"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr ""
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr ""
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr ""
@@ -23403,10 +23668,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr ""
@@ -23417,14 +23683,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -23438,35 +23704,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr ""
@@ -23474,20 +23740,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr ""
@@ -23495,145 +23761,213 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr ""
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr ""
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Kauplus"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+msgid "Cargo"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "jalgrattaga"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr ""
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr ""
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr ""
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr ""
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr ""
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr ""
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr ""
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr ""
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr ""
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr ""
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr ""
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr ""
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23643,16 +23977,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr ""
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
-msgstr ""
+msgstr "Raudtee"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr ""
@@ -23660,5 +24016,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr ""
@@ -23688,7 +24044,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23704,8 +24060,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23719,29 +24075,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23754,8 +24110,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23826,8 +24182,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23839,8 +24195,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Pinge"
@@ -23853,8 +24209,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23867,23 +24223,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr ""
@@ -23891,50 +24247,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -23942,5 +24298,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23949,10 +24305,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr ""
@@ -23961,9 +24317,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr ""
@@ -23972,5 +24328,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -23979,5 +24335,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -23987,5 +24343,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -23993,5 +24349,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr ""
@@ -24000,5 +24356,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24007,10 +24363,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
-msgstr ""
+msgstr "Köisraudteed"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr ""
@@ -24018,10 +24374,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24029,10 +24385,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr ""
@@ -24040,10 +24396,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24051,10 +24407,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24063,5 +24420,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24069,5 +24426,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24076,5 +24433,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24082,5 +24439,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr ""
@@ -24090,69 +24447,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr ""
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "Pank"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24169,34 +24548,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24204,37 +24584,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Avatud"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24255,33 +24646,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24290,170 +24683,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "pood"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Nurgakauplus"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24461,4 +24876,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24470,6 +24886,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr ""
@@ -24478,5 +24894,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr ""
@@ -24487,25 +24903,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24514,54 +24932,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr ""
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Automüüja"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Autopoe muutmine"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr ""
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Mänguasjad"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Muuda puud"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Vastuolu"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefoninumber"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr ""
@@ -24570,10 +25132,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr ""
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr ""
@@ -24581,28 +25142,86 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr ""
+
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Vali kiirpuhastus"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr ""
+
+#: build/trans_presets.java:1459
+msgid "Motorcycle Dealer"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Vali kool"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Teenindus"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Salvesta"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "tee"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Eelseaded"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Riided"
 
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr ""
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr ""
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Jalgrattamüüja"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Jalgrattapoe muutmine"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24612,5 +25231,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24618,5 +25237,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24624,5 +25243,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -24630,5 +25249,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -24636,5 +25255,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr ""
@@ -24643,5 +25262,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr ""
@@ -24649,12 +25268,12 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
-msgstr ""
+msgstr "Raudteeplatvorm"
 
 #. item "Public Transport/Railway Platform"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr ""
@@ -24666,5 +25285,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24672,10 +25291,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr ""
@@ -24684,10 +25303,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr ""
@@ -24696,5 +25315,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr ""
@@ -24703,5 +25322,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr ""
@@ -24709,5 +25328,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr ""
@@ -24717,13 +25336,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr ""
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr ""
@@ -24731,19 +25349,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -24751,5 +25369,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr ""
@@ -24757,5 +25375,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr ""
@@ -24763,10 +25381,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr ""
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24774,5 +25392,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24780,10 +25398,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr ""
@@ -24792,5 +25410,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24798,5 +25416,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24804,5 +25422,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24810,5 +25428,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24816,5 +25434,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24822,5 +25440,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24830,5 +25448,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24838,5 +25456,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24847,6 +25465,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -24856,5 +25474,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24863,5 +25481,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24869,5 +25487,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24875,15 +25493,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Majutus"
@@ -24895,5 +25513,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -24902,5 +25520,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr ""
@@ -24913,8 +25531,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr ""
@@ -24938,34 +25556,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -24979,168 +25597,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "lennuterminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefoninumber"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr ""
@@ -25148,20 +25671,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr ""
@@ -25169,10 +25692,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr ""
@@ -25180,30 +25703,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr ""
@@ -25211,10 +25735,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -25225,5 +25749,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -25231,5 +25755,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr ""
@@ -25237,5 +25761,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr ""
@@ -25243,79 +25769,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -25323,18 +25849,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25342,10 +25868,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kohvik"
@@ -25353,10 +25879,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr ""
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pubi"
@@ -25364,20 +25895,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Baar"
@@ -25385,10 +25916,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -25396,25 +25927,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Muuseum"
@@ -25422,9 +25953,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -25433,9 +25964,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Teemapark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr ""
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr ""
@@ -25443,50 +25995,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Teemapark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr ""
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr ""
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Lõkkease"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Piknikuplats"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Infopunkt"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25524,5 +26077,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25530,28 +26083,28 @@
 msgstr "tänav"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25561,5 +26114,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25567,5 +26120,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Matkamine"
@@ -25573,6 +26126,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr ""
@@ -25580,5 +26133,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25586,6 +26139,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -25593,5 +26146,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25599,46 +26152,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25647,5 +26200,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25653,55 +26206,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr ""
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Lõkkease"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Piknikuplats"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Loss"
@@ -25710,19 +26242,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr ""
@@ -25731,9 +26263,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr ""
@@ -25741,10 +26273,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25752,5 +26284,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25758,15 +26290,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -25774,55 +26306,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -25830,35 +26362,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr ""
@@ -25872,6 +26404,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -26287,6 +26819,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26321,240 +26853,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Miniatuurne golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26571,5 +27103,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26596,23 +27127,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tüüp"
@@ -26629,5 +27168,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26654,211 +27192,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr ""
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr ""
@@ -26866,52 +27407,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -26919,204 +27460,268 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+msgid "Motorsport"
+msgstr ""
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Vali arstid"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Hoiatus"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Vali vangla"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Arstid"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Vali arstid"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Vali kiirpuhastus"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Vali elektri generaator"
+
+#: build/trans_presets.java:2480
+msgid "RC Car"
+msgstr ""
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Muuda parki"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
-msgstr ""
+msgstr "Inimtekkeline"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Hoone"
@@ -27124,16 +27729,16 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
-msgstr "Avalik hoone"
+msgstr "Ühiskondlik hoone"
 
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Raekoda"
@@ -27141,10 +27746,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Saatkond"
@@ -27152,10 +27757,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -27164,10 +27769,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Vangla"
@@ -27176,10 +27781,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Politsei"
@@ -27189,10 +27794,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -27201,10 +27806,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postkontor"
@@ -27212,5 +27817,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr ""
@@ -27218,15 +27823,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Kool"
@@ -27234,10 +27839,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Ülikool"
@@ -27245,10 +27850,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Kolledž"
@@ -27256,5 +27861,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -27262,5 +27867,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kino"
@@ -27269,10 +27874,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Raamatukogu"
@@ -27281,9 +27886,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr ""
@@ -27291,10 +27896,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teater"
@@ -27303,10 +27908,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -27316,5 +27921,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -27323,6 +27928,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religioon"
@@ -27331,66 +27936,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -27399,189 +28004,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Aadressid"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Vali aadressi infot"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Maja number"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Maja nimi"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Linna nimi"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Posti kood"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Riigi kood"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "paaritu"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "paaris"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Töökojad"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27589,25 +28124,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
-msgstr "Vali veetorn"
+msgstr "Veetorni muutmine"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -27615,10 +28150,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -27626,10 +28161,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Torustik"
@@ -27638,43 +28173,43 @@
 #. <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:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gaas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "õli"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
-msgstr ""
-
-#: build/trans_presets.java:2563
+msgstr "veealune"
+
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
-msgstr ""
+msgstr "Reovee puhastusjaam"
 
 #. item "Man Made/Wastewater Plant"
@@ -27682,10 +28217,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Kraana"
@@ -27693,5 +28228,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Vali kraana"
@@ -27699,10 +28234,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -27710,10 +28245,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -27721,23 +28256,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -27747,35 +28282,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "päikeseenergia"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -27784,10 +28319,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -27796,5 +28331,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -27802,10 +28337,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr ""
@@ -27816,23 +28351,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr ""
@@ -27841,20 +28376,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27862,55 +28397,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "üksik"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "topelt"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "kolmekordne"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Tualetid"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -27919,5 +28454,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr ""
@@ -27925,5 +28460,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mündid"
@@ -27931,5 +28466,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Märkused"
@@ -27937,5 +28472,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27943,5 +28478,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -27949,15 +28484,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -27966,5 +28501,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -27972,74 +28507,69 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Riided"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
-msgstr ""
+msgstr "Prügikorv"
 
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
-msgstr ""
+msgstr "Prügikorvi muutmine"
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "kivi"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastikust"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "must"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "pruun"
@@ -28118,5 +28648,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28126,31 +28656,31 @@
 msgstr "roheala"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "punane"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "sinine"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "hall"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "valge"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Istekohtade arv"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -28158,31 +28688,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Purskaev"
@@ -28191,344 +28721,335 @@
 #. <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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
-msgstr "Joogi vesi"
+msgstr "Joogivesi"
 
 #. item "Amenities/Drinking Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
-msgstr "Vali joogivee asukoht"
+msgstr "Joogivee muutmine"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
-msgstr ""
+msgstr "Tuletõrjehüdrant"
 
 #. 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:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
-msgstr ""
+msgstr "Tuletõrjehüdrandi muutmine"
 
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "mets"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Vali Supermarket"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Nurgakauplus"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Vali nurgakauplus"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Vali kiosk"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Lihunik"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Vali lihunik"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Pagar"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Vali pagar"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Ökokaubad"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Redigeeri ökopoodi"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Redigeeri alkoholi poode"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Joogipood"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Alkoholipoe redigeerimine"
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr ""
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr ""
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Vali Supermarket"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr "Rohupood"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr "Rohupoe redigeerimine"
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Nurgakauplus"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Vali nurgakauplus"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Vali kiosk"
-
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Juuksur"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Vali juuksur"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optik"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Vali optika"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Vali arvutipood"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Jalatsid"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Vali jalatsi pood"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Välisuks"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Vali välisukse pood"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Vali spordi pood"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Kuiir puhastus"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Vali kiirpuhastus"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Pesumaja"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Vali pesumaja"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "ülarelss"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Vali torn"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Arvuti"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Vali arvutipood"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektroonika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Vali elektroonika pood"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hi-Fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Hi-Fi poe redigeerimine"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Vali video pood"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Lilleseadja"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Vali lilleseadja"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Aiakeskus"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Vali aiakeskus"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Riistvara"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Vali riistvara pood"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Mööbel"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Vali mööblipood"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Kirjatarbed"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Vali kirjatarvete pood"
+
+#: build/trans_presets.java:3010
 msgid "Book Store"
 msgstr "Raamatupood"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:3011
 msgid "Edit Book Store"
 msgstr "Raamatupoe redigeerimine"
 
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:3016
 msgid "Travel Agency"
 msgstr "Reisibüroo"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:3017
 msgid "Edit Travel Agency"
 msgstr "Reisibüroo redigeerimine"
 
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Lihunik"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Vali lihunik"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Pagar"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Vali pagar"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Lilleseadja"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Vali lilleseadja"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Ökokaubad"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Redigeeri ökopoodi"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Redigeeri alkoholi poode"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Joogipood"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Alkoholipoe redigeerimine"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Arvuti"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Vali arvutipood"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektroonika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Vali elektroonika pood"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hi-Fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Hi-Fi poe redigeerimine"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Mööbel"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Vali mööblipood"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Aiakeskus"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Vali aiakeskus"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Riistvara"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Vali riistvara pood"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Kirjatarbed"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Vali kirjatarvete pood"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Juuksur"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Vali juuksur"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Jalatsid"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Vali jalatsi pood"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Vali video pood"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Kuiir puhastus"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Vali kiirpuhastus"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Pesumaja"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Vali pesumaja"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Välisuks"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Vali välisukse pood"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Vali spordi pood"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optik"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Vali optika"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Müügiautomaat"
@@ -28536,5 +29057,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Müügiautomaadi redigeerimine"
@@ -28542,97 +29063,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Müüdavad kaubad"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Pank"
@@ -28640,14 +29161,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Rahavahetus"
@@ -28655,5 +29176,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetuse punkt"
@@ -28661,15 +29182,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "Arstid"
@@ -28677,18 +29198,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -28696,5 +29217,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -28702,9 +29223,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Haigla"
@@ -28712,10 +29233,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -28724,5 +29256,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -28731,15 +29263,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28747,5 +29279,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -28754,368 +29286,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geograafia"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Piirid"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Riiklikud"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Muuda riiklikke piire"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administratiivpiir"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Muuda administratiivpiire"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Omavalitsus"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Muuda omavalitsuse piire"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Valimisringkond"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Muuda valimisringkonda"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Rahvuspark"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Muuda rahvuspargi piire"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Asukohad"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Maa"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Vali maa"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Riik"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Vali riik"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Regioon"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Vali regioon"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Maakond"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Vali maakond"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Linn"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Vali linn"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Linn"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Muuda linna"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Linnaosa"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Küla"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Asustamata koht"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Mäetipp"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Muuda mäetippu"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Liustik"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Muuda liustikku"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulkaan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Muuda vulkaani"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Koobas"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Muuda koobast"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Saar"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Muuda saart"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Laid"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
-msgstr ""
-
-#. item "Geography/Places/Islet" text "Name"
+msgstr "Laiu muutmine"
+
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Teater"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Üksik puu"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Muuda puud"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botaaniline nimi"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Mets"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Muuda metsa"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "okasmets"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "lehtmets"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "segamets"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Kultuurmets"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Muuda kultuurmetsa"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Looduskaitseala"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Muuda looduskaitseala"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Koobas"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Muuda koobast"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Mäetipp"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Muuda mäetippu"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Liustik"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Muuda liustikku"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulkaan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Muuda vulkaani"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Piirid"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Riiklikud"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Muuda riiklikke piire"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administratiivpiir"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Muuda administratiivpiire"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Omavalitsus"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Muuda omavalitsuse piire"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Valimisringkond"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Muuda valimisringkonda"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Rahvuspark"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Muuda rahvuspargi piire"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "klibu, rusukalle"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Muuda rusukallet"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Langus"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Muuda langust"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Võsa"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Muuda võsa"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Nõmm"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Muuda nõmme"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Üksik puu"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Muuda puud"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botaaniline nimi"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Mets"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Muuda metsa"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "okasmets"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "lehtmets"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "segamets"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Kultuurmets"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Muuda kultuurmetsa"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Looduskaitseala"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Muuda looduskaitseala"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "klibu, rusukalle"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Muuda rusukallet"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Võsa"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Muuda võsa"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Langus"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Muuda langust"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Nõmm"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Muuda nõmme"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -29124,45 +29662,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -29170,25 +29708,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Külatanum"
@@ -29196,10 +29734,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Avalik maa"
@@ -29207,20 +29745,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -29228,5 +29766,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -29234,15 +29772,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -29250,9 +29788,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -29260,39 +29798,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Raudtee"
@@ -29300,15 +29838,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -29316,52 +29854,180 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Vaatamisväärsus"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Aadressid"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Vali aadressi infot"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Maja number"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Maja nimi"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr ""
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Linna nimi"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Posti kood"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Riigi kood"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+msgid "AT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "DE"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "IT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "US"
+msgstr ""
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "paaritu"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "paaris"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Vastuolu"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Lisa autori informatsioon"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "pilt"
 
 #. item "Relations/Multipolygon"
@@ -29369,5 +30035,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -29379,5 +30045,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "väline osa"
@@ -29385,5 +30051,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "siseosa"
@@ -29391,5 +30057,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Piir"
@@ -29400,5 +30066,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Muuda piiri"
@@ -29406,36 +30072,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Piiri tüüp"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "haldusüksus"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "rahvuslik"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "poliitiline"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Haldusüksuse tase"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Haldusüksuse keskus"
@@ -29443,5 +30109,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -29450,5 +30116,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -29456,34 +30122,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -29492,15 +30158,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 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:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "teele"
@@ -29508,5 +30174,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Teekond"
@@ -29515,5 +30181,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -29521,132 +30187,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "teekonna tüüp"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "jalgrattaga"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "suusad"
@@ -29714,5 +30269,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29722,9 +30277,9 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "ümbersõit"
@@ -29738,10 +30293,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -29749,31 +30304,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -29782,30 +30337,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
@@ -30300,5 +30855,5 @@
 #: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
-msgstr ""
+msgstr "tõke"
 
 #. color barrier
@@ -31083,5 +31638,5 @@
 #: build/trans_style.java:1440 build/trans_style.java:1448
 msgid "aerialway"
-msgstr "trosstransport"
+msgstr "köisraudtee"
 
 #. color aerialway
@@ -33783,7 +34338,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -33905,5 +34459,5 @@
 msgstr "Sitsiilia - Itaalia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
@@ -33913,4 +34467,7 @@
 #~ msgstr "Lae OSMi serverisse"
 
+#~ msgid "Waterway Point"
+#~ msgstr "Veetee punkt"
+
 #~ msgid "Move"
 #~ msgstr "Liiguta"
@@ -33936,9 +34493,4 @@
 #~ msgid "Delete the selected layer."
 #~ msgstr "Kustuta valitud kiht"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "pilt"
-#~ msgstr[1] "pildid"
 
 #~ msgid "Sync clock"
Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 22859)
+++ applications/editors/josm/i18n/po/eu.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-07-06 17:47+0000\n"
 "Last-Translator: Mikel Lizarralde <mlizarralde@tagzania.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Kontuz"
@@ -122,9 +122,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editorea"
@@ -132,5 +132,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -256,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -281,5 +281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -304,5 +304,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -413,4 +413,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1065,5 +1066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1076,5 +1077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1490,13 +1491,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1505,5 +1506,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1511,9 +1512,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1521,5 +1522,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1553,8 +1554,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1563,9 +1564,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1581,6 +1582,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1590,5 +1591,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1613,6 +1614,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Errorea"
@@ -1775,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Ez, bertan behera utzi"
@@ -2063,5 +2064,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2555,5 +2556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2597,9 +2598,9 @@
 "Benetan denak mugitu nahi dituzu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Askatu saguaren botoia errektanguluko objektuak hautatzeko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2608,9 +2609,9 @@
 "egiteko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Askatu saguaren botoia errotazioa gelditzeko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2902,5 +2903,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Bilatu"
@@ -3110,7 +3111,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3381,5 +3382,5 @@
 msgstr[1] "Mugitu {0} nodoak"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3537,31 +3538,31 @@
 msgstr "Etiketen konponketa automatikoa"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3580,15 +3581,15 @@
 msgstr "Longitudearen ''{0}'' balio ilegalak"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Kontuz: huts egin du hobespenak ''{0}'' gordetzean"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfigurazio fitxategian malformazioa {0} lerroetan"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3599,5 +3600,5 @@
 "ez da direktorio bat."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3608,5 +3609,5 @@
 "direktorioa ez da direktorio bat.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3617,5 +3618,5 @@
 "hobespen direktorioa sortzean: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3626,5 +3627,5 @@
 "hobespenen direktorioa sortzean: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3634,5 +3635,5 @@
 "fitxategi bat sortzen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3643,5 +3644,5 @@
 "fitxategiagatik."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3652,5 +3653,5 @@
 "fitxategia jatorrizkora berrezartzeak: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3661,5 +3662,5 @@
 "da <br>{0}<br>n eta lehenetsitako hobespen fitxategia sortzen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3670,10 +3671,10 @@
 "fitxategia berrabiaraztean huts egin du: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Errorea: Espero ez zen ''{0}'' lerroa laster-marka honetan ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3803,5 +3804,5 @@
 "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3878,9 +3879,9 @@
 "balioa {0} da"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "ID = 0 den jatorrizko bat ezin da ikusezina izan"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3890,5 +3891,5 @@
 "bestea ez"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4085,15 +4086,34 @@
 msgstr "PUWG 2000 Zonaldea {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suitza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zonaldea"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Ordenatu"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Jauzi hara"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4117,9 +4137,9 @@
 msgstr "Frantziar Guyana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM Frantzia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "UTM Sistema-geodesikoa"
@@ -4164,5 +4184,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "trenbidea"
@@ -4183,5 +4203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4437,29 +4457,29 @@
 msgstr "Pasahitza"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "erabilera"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "aukerak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Erakutsi laguntza hau"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Unixeko geometria argumento estandarra"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Deskargatu inguru-koadroa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Deskargatu URL-ean zehaztutako tokia (lat=x&lon=y&zoom=z erabiliz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4467,9 +4487,9 @@
 "Ireki aukerarekin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Deskargatu inguru-koadroa gps datu gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4477,33 +4497,33 @@
 "gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Aukeratu emandako bilaketarekin"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Abiarazi modu maximizatuan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Preferentziak jatorrizkora berrezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Hizkuntza ezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/JOSM/KARPETARA/BIDEA/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Erabiltzailearen hobespen guztientzat karpeta aldatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4517,9 +4537,9 @@
 "megabytetan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "adibideak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4529,58 +4549,67 @@
 "prozesatzen dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "--selection erabiltzen baduzu, ziurtatu zenbait datu kargatzen dituzula."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Hasieratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Pluginak eguneratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Eguneratutako pluginak instalatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Hasierako pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Hobespen orijinalak ezartzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "GUI nagusia sortzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debitu-txartelak"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "{0} hobespena ezabatu dugu ez bait da jadanik erabiltzen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4590,9 +4619,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4606,9 +4635,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4732,23 +4762,23 @@
 msgstr "Erabiltzailea:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "Geruza hau ez dago zerrendan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "\"{0}\" geruzak, geruzen zerrendan egon behar du"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4845,5 +4875,5 @@
 msgstr "Klik egin dialogoa itxi eta objektuak ezabatzeari uzteko"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4853,17 +4883,17 @@
 "jakin batean.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Zoom maila:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "koadrotik"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "koadrora"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4877,25 +4907,25 @@
 "ere..</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Koadro helbidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Erabili koadro helbidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Mesedez, eman tile helbidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Oraingo balorea ez da koadro helbide zuzena"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Mesedez, sartu koadroaren indizea"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "Oraingo balioa ez da koadro helbide zuzena zoom maila honetarako"
@@ -5314,4 +5344,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5395,4 +5426,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5409,4 +5441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5480,5 +5513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5490,10 +5523,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ezer ere ez"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "denak"
@@ -5575,5 +5608,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5585,5 +5618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5618,17 +5651,17 @@
 msgstr "Oraindik erabaki gabe"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Rola:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5636,15 +5669,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Gakoa:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5652,10 +5685,10 @@
 msgstr "Balioa:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5667,5 +5700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5677,5 +5710,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5818,5 +5851,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5929,5 +5962,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5935,5 +5968,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5941,5 +5974,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5947,5 +5980,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5953,5 +5986,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5960,5 +5993,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5966,5 +5999,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5972,5 +6005,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5978,24 +6011,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Iragazkia aktibatuta dago</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektuak ezkutaturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<p><b>{0}</b> objektuak desgaiturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6018,5 +6051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6041,37 +6074,37 @@
 msgstr "Objektuen informazio aurreratua"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Sartu nodo berriarentzako koordenatuak."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Erabili gradu hamartarrak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Balio negatiboek Mendebaldeko/Hegoaldeko hemisferioa adierazten dute."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Mesedez, sar ezazu baliogarria den latitude bat -90..90 tartean"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Mesedez, sar ezazu -90..90 tartean dagoen latitude bat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Mesedez, sar ezazu baliogarria den longitude bat -180..180 tartean"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Mesedez, sar ezazu -180..180 tartean dagoen longitude bat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Itxi elkarrizketa-leihoa eta sortu nodo berria"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Itxi elkarrizketa-leihoa, ez sortu nodo berririk"
@@ -6127,9 +6160,9 @@
 msgstr "Geruzari buruzko informazioa"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Erlazioak"
@@ -6177,10 +6210,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6200,37 +6233,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6239,32 +6272,32 @@
 msgstr "Aukeraketa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Aukeraketa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6542,13 +6575,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Orain jaitsi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr ""
@@ -6660,4 +6693,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6676,6 +6713,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6693,8 +6728,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6705,4 +6747,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6717,33 +6765,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6767,12 +6804,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6844,10 +6891,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6877,8 +6928,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6941,6 +6988,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6993,4 +7038,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7055,32 +7112,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7089,6 +7154,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7097,24 +7164,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7129,82 +7186,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7285,155 +7342,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Izena"
@@ -7857,4 +7919,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<ezberdina>"
@@ -8359,17 +8422,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8644,4 +8707,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8649,15 +8713,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr ""
@@ -8676,16 +8740,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr ""
@@ -9252,5 +9316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9473,20 +9537,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr ""
@@ -9933,11 +9997,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9945,5 +10004,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9951,5 +10011,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -9959,23 +10019,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Menua: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -9984,5 +10047,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -9991,10 +10055,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "Etiketa {0}"
+msgstr[1] "{0} etiketa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10002,10 +10079,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10016,7 +10093,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10024,10 +10101,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10035,10 +10112,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10046,21 +10123,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10070,9 +10147,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10080,5 +10157,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10086,30 +10163,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10117,5 +10194,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10124,5 +10201,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10131,18 +10208,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10152,23 +10229,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10601,15 +10678,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11540,4 +11617,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "{0} bidea ezabatu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11620,5 +11740,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr ""
@@ -11637,16 +11757,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr ""
@@ -11680,12 +11800,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr ""
@@ -11931,18 +12051,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12257,26 +12377,18 @@
 msgstr "{0} proiekzioa ezin izan da aktibatu. Mercator erabiltzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12392,6 +12504,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "txandakatu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12608,12 +12729,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12793,5 +12906,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12800,49 +12913,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12852,15 +12965,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12870,17 +12983,17 @@
 msgstr[1] "Aldatu {0} objektuak"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13484,5 +13597,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13580,5 +13693,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13587,5 +13700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13654,5 +13767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13662,10 +13775,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13673,5 +13786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13679,5 +13792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13685,10 +13798,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13696,5 +13809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13702,5 +13815,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13708,5 +13821,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13715,10 +13828,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13726,9 +13839,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13736,11 +13849,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13752,8 +13865,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13767,5 +13880,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13773,5 +13886,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13780,6 +13893,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13791,6 +13904,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13799,5 +13912,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13805,5 +13918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13811,12 +13924,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13824,5 +13937,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13832,5 +13945,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13840,5 +13953,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13846,17 +13959,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14352,11 +14465,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14365,16 +14478,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14383,5 +14496,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14402,13 +14515,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14417,9 +14530,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14427,5 +14540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14433,5 +14546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14440,5 +14553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14446,9 +14559,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14642,5 +14755,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14693,5 +14806,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14701,5 +14814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14707,5 +14820,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14714,5 +14827,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -14813,5 +14926,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14897,10 +15010,61 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Irekiera-ordutegia"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Aldatu propietateak"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Aukeratu balio bat"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Mapa: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Tresna: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "ireki"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -15072,51 +15236,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Ezin da nodorik gehitu mundutik kanpo."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "''{0}'' parametroa ezin da nulua izan"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "''{0}'' parametroa ezin da nulua izan"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15215,16 +15381,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15238,5 +15396,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15349,5 +15507,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Eraikinak"
@@ -15584,5 +15742,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15997,8 +16155,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16112,6 +16266,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Geruza garbia"
@@ -17463,5 +17617,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr ""
@@ -17505,48 +17659,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "objektu berriak sortu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17555,34 +17713,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17805,58 +17963,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Mapa irristakorra"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -18140,11 +18298,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Hodiak editatu"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19221,5 +19378,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipoligonoa"
@@ -19339,59 +19496,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Gehigarri honek erlazioetako arazoak egiaztatzen ditu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19882,144 +20039,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "GPS arrastoaren % {0} {1}tik"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Bideoan egungo kokapena erakusten du"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Bideoa inportatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Sinkronizatu bideo bat GPS arrastoarekin"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Bideoa ezabatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "bideoa ezabatzen du geruzatik"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "erreproduzitu/pausatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "hasi/pausatu bideoaren play-back-a"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "atzerantz"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "salto"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Mesedez, sartu koadroaren indizea"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "aurrerantz"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "azkarrago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "play-back-a azkarrago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "polikiago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "play-back-a polikiago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "begizta"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Zentratuta mantendu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "bideoaren ikonoa jarraitzen du automatikoki"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Eskailera (hesi edo langa gainetik pasatzeko)"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Bideoan egungo kokapena erakusten du"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Jauziaren luzera"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Jauziaren luzera ezarri"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "X ms-etarako bideo-jauzia"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Begizta-luzera"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Begizta-puntuaren inguruko luzera ezarri"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20039,7 +20192,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multi"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20141,7 +20293,6 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Aukeratu emandako bilaketarekin"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20162,9 +20313,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Salbuespena gertatu da"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Ez dago aurrememorian"
@@ -20223,21 +20374,21 @@
 msgstr "Aukeratutako WMS geruzaren kokapena doitu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Mesedez, aukeratu doitu beharreko WMS geruza."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "WMS geruza aukeratu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Doiketa hasi"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Uneotan ez dago doitzeko WMS geruzarik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Ez dago doitzeko geruzarik"
@@ -20248,5 +20399,5 @@
 msgstr "Jaitsi WMS \"tile\"a {0}tik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20256,5 +20407,5 @@
 "Kontuz: WMS zerbitzuaren \"{0}\" URLa ez da '&' edota '?'rekin bukatzen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20264,10 +20415,10 @@
 "zure hobespenen konfigurazioa."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Kontuz: URL osoa \"{0}\" da."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20278,5 +20429,5 @@
 "Koordenatu okerretara eraman gaitzake honek."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20284,19 +20435,19 @@
 "Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(desaktibatua)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "({0}) WMS geruza, automatikoki jaisten {1} zoom mailan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "({0}) WMS geruza, {1} zoom mailan jaisten"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20311,17 +20462,17 @@
 "jaitsi nahi dituzu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Bai, jaitsi irudiak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "URL desegokia?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Jaitsi ikusgai dauden \"tile\"ak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20330,33 +20481,33 @@
 "bereizmena"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Bereizmena aldatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "\"Tile\" okerrak berriz kargatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha kanala"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Gorde WMS geruza fitxategian"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Gorde WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Kargatu WMS geruza fitxategitik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Kargatu WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -20364,25 +20515,49 @@
 "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Fitxategiaren formatuan errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Fitxategia kargatzean errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "WMS laster-marka ezarri"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Jaitsiera automatikoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ireki WMS geruza-zuri bat fitxategi batetik datuak kargatzeko"
@@ -20957,16 +21132,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers-eko irudi bat erakusten du hondoan"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "OpenStreetBugs-etik akatsak jaisten ditu"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20976,5 +21156,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20984,5 +21164,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20993,5 +21173,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21002,10 +21182,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic handiaren \"Look and Feel\"-a."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21014,15 +21194,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Utzi beste aplikazioei JOSMra komandoak bidaltzen."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Aldaketa-multzoak"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21032,5 +21212,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21042,10 +21222,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Bideratzaile-gaitasunak ematen ditu"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21057,5 +21237,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21066,10 +21246,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -21078,5 +21258,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21090,15 +21270,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21109,5 +21289,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21118,5 +21298,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21127,5 +21307,5 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
@@ -21134,5 +21314,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21144,5 +21324,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21155,5 +21335,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21165,20 +21345,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Elkar-konektaturiko bide luzeen deskarga erraza"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Aukeratu adarkadura ez dute konektaturiko bideak"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21189,5 +21369,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21231,4 +21411,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21261,10 +21442,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Bideak"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Kaleak"
@@ -21275,5 +21456,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autobide"
@@ -21282,5 +21463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Autobidea editatu"
@@ -21317,10 +21498,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Erreferentzia"
@@ -21334,8 +21515,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Erreiak"
@@ -21354,13 +21535,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Gehienezko abiadura (km/o)"
@@ -21394,17 +21575,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Norabide bakarra"
@@ -21441,17 +21622,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21485,17 +21666,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunela"
@@ -21526,17 +21707,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Mozketa"
@@ -21567,17 +21748,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Lubeta"
@@ -21585,5 +21766,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Autobide-lotura"
@@ -21592,5 +21773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Autobide-lotura editatu"
@@ -21598,5 +21779,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Errepide nagusia"
@@ -21605,5 +21786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Errepide nagusia editatu"
@@ -21613,6 +21794,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Autobidea"
@@ -21620,5 +21801,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Errepide nagusiaren lotura"
@@ -21627,5 +21808,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Errepide nagusi-lotura"
@@ -21638,5 +21819,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Lehen mailako errepidea"
@@ -21645,5 +21826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Lehen mailako errepidea editatu"
@@ -21651,10 +21832,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Lehen mailako errepidearen lotura"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Lehen mailako errepidearen lotura editatu"
@@ -21666,5 +21847,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Bigarren mailako errepidea"
@@ -21674,5 +21855,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Bigarren mailako errepidea editatu"
@@ -21680,5 +21861,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Hirugarren mailako errepidea"
@@ -21688,5 +21869,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Hirugarren mailako errepidea editatu"
@@ -21698,5 +21879,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Sailkatu gabeko errepidea"
@@ -21706,5 +21887,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Sailkatu gabeko errepidea editatu"
@@ -21714,6 +21895,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Aurreratze-lekua"
@@ -21736,15 +21917,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Zabalera (metroak)"
@@ -21756,5 +21937,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Kalea"
@@ -21763,5 +21944,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Hiriko-kalea"
@@ -21781,12 +21962,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Gainazala"
@@ -21808,166 +21989,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "zolatua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "zolatu-gabea"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfaltua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "hormigoi"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metala"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "egurra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "galtzada-arri zola"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "galtzada-arria"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "hartxintxar"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "trinkotua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "landare-zolua"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "belarra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "hondarra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "lursaila"
@@ -21975,5 +22156,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Bizitegi-kalea"
@@ -21982,5 +22163,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Bizitegi-kalea editatu"
@@ -21988,5 +22169,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Oinezkoen kalea"
@@ -21995,5 +22176,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Oinezkoen kalea editatu"
@@ -22001,5 +22182,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Zerbitzu-bidea"
@@ -22008,5 +22189,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Zerbitzu-bidea editatu"
@@ -22016,18 +22197,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Zerbitzu-bide mota"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "kalezuloa"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "sarrera-bidea (etxe, baserri eta abarrerantz)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "aparkalekuetako-bidea"
@@ -22035,5 +22216,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Aparkalekuetako-bidea"
@@ -22043,10 +22224,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Aparkalekuetako-bidea editatu"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Errepidea (mota ezezaguna)"
@@ -22055,5 +22236,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Errepidea (mota ezezaguna) editatu"
@@ -22061,14 +22242,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Eraikuntza"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Eraikuntzan dagoen bidea editatu"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Elkargunea"
@@ -22084,5 +22265,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "errotonda"
@@ -22091,5 +22272,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Trafikoaren murrizketak"
@@ -22098,15 +22279,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Bidearen murrizketak editatu"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Ordainsaria"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Irteera gabea (cul-de-sac)"
@@ -22114,5 +22295,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Sarbidea"
@@ -22138,4 +22319,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22143,4 +22325,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22216,236 +22404,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+msgid "yes"
+msgstr "bai"
+
+#. 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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "pribatua"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:219
+msgid "destination"
+msgstr "norakoa"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "baimendua"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "nekazal"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "baso"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "banaketa"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "ez"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Nekazaritza"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "bai"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "baimendua"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "pribatua"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "norakoa"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "baimendua"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "nekazal"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "baso"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "banaketa"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "ez"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Nekazaritza"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "baimendua"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "ofiziala"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Merkantziak"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ibilgailu pisutxuak (6 t. baino gehiago)"
@@ -22460,10 +22655,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Zaldia"
@@ -22479,10 +22674,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motozikleta"
@@ -22497,19 +22693,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Zerbitzu-publikoko ibigailuak (ZPI)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Gutxieneko abiadura (km/o)"
@@ -22517,20 +22713,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Gehienezko pixua (t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Gehienezko garaiera (metrotan)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Gehienezko zabalera (metrotan)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Gehienezko luzeera (metrotan)"
@@ -22538,5 +22734,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Errotonda"
@@ -22547,5 +22743,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Elkargunea editatu"
@@ -22565,10 +22761,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobidea"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Autobidearen lotura"
@@ -22590,10 +22786,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "errepide nagusia"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "errepide nagusiaren lotura"
@@ -22615,10 +22811,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "lehenengo mailakoa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "lehenengo mailako errepidearen lotura"
@@ -22640,5 +22836,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22653,9 +22849,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "hirugarren mailakoa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "sailkapenik gabeko errepidea"
@@ -22669,9 +22865,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "kalea"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "bizitegi-kalea"
@@ -22715,10 +22911,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "zerbitzu-bidea"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "gidatutako autobus-bidea"
@@ -22748,5 +22944,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22758,10 +22954,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Zubia editatu"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Tunela editatu"
@@ -22769,10 +22965,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Bideak"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Pista"
@@ -22781,35 +22977,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Pista editatu"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Pista-mota"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "1. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "2. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "3. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "4. gradukoa"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "5. gradukoa"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB eskala"
@@ -22817,5 +23013,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Ibilbidea"
@@ -22824,76 +23020,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Ibilbidea editatu"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC eskala"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "xenda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "mendi-xenda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "mendi-xenda zaila"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "alpinismo-xenda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "alpinismo-xenda nekeza"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "alpinismo-xenda zaila"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "bikaina"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "ona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "ertaina"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "txarra"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "oso txarra"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Gurpil-aulkiak"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Eskia"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Elur-lera"
@@ -22902,5 +23098,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Dedikatutako ferra-bidea"
@@ -22908,5 +23104,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Dedikatutako ferra-bidea editatu"
@@ -22914,5 +23110,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Dedikatutako bizikleta-bidea"
@@ -22930,11 +23126,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Bizikleta-bidea editatu"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Oinezkoak"
@@ -22942,5 +23138,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Bizikleta-bidea eta oinezkoena bananduta"
@@ -22948,5 +23144,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Bizikleta-bidea eta oinezkoena batuta"
@@ -22954,5 +23150,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Dedikatutako oinezko-bidea"
@@ -22961,5 +23157,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Oinezko-bidea editatu"
@@ -22967,5 +23163,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Eskailerak"
@@ -22975,10 +23171,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Eskailera-bidea editatu"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Jarleku kopurua"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Autobideko irteera"
@@ -22986,15 +23188,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Autobideko irteera editatu"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Zenbakia"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Zerbitzuak"
@@ -23002,5 +23204,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Zerbitzu-gunea editatu"
@@ -23008,10 +23210,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23040,36 +23243,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operadorea"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "erreka"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Jatetxea editatu"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Larrialdietako telefonoa"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semaforoa"
@@ -23079,5 +23303,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Oinezkoen bidegurutze mota"
@@ -23086,27 +23310,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "kontrolik gabea"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "semaforoa"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "irla"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "markatugabea"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Zaldien bidegurutzea"
@@ -23114,6 +23338,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Bizikleten bidegurutzea"
@@ -23122,11 +23346,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Bidegurutze-zaintzailea"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Bidegurutze motaren izena (Erresuma Batua)"
@@ -23134,30 +23358,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelikanoa"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "tukana"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tigrea"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Gelditu"
@@ -23165,67 +23389,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Oinezkoen pasabidea"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Pasabidea editatu"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Izen-mota (Erresuma batua)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Trafikoaren arinketa"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Trafikoaren arinketa editatu"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "salto"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "estugune"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "taula"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Aurreratze-lekua"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Aurreratze-lekua editatu"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Errotonda txikia"
@@ -23236,14 +23398,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Norabidea"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "erlojuaren norabidea"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Oinezkoen pasabidea"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Pasabidea editatu"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Izen-mota (Erresuma batua)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Trafikoaren arinketa"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Trafikoaren arinketa editatu"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "salto"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "estugune"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "taula"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Aurreratze-lekua"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Aurreratze-lekua editatu"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Biraketa-zirkulua"
@@ -23253,5 +23477,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Hiriaren muga"
@@ -23259,15 +23483,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Hiriaren muga-seinalea editatu"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Bigarren izena"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Abiadura radarra"
@@ -23276,11 +23500,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Larrialdietako telefonoa"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Penditza"
@@ -23288,5 +23507,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Penditza handia"
@@ -23294,5 +23513,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Hartxintxar edukiontzia"
@@ -23302,10 +23521,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Ibia"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Ibia editatu"
@@ -23313,5 +23532,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Mendatea"
@@ -23319,5 +23538,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Mendatea editatu"
@@ -23326,10 +23545,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Garaiera"
@@ -23337,5 +23556,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Oztopoak"
@@ -23343,5 +23562,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Bolardoa"
@@ -23349,5 +23568,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Bolardoa editatu"
@@ -23392,16 +23611,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Baimendutako trafikoa"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Bizikletentzako oztopoa"
@@ -23410,5 +23629,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Blokea"
@@ -23416,5 +23635,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena)"
@@ -23422,10 +23641,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena) editatu"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Autobusentzako tranpa"
@@ -23433,15 +23652,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Arantzak"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Arantzak editatu"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Ordainlekua"
@@ -23449,5 +23668,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Ordainlekua editatu"
@@ -23455,10 +23674,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Muga-kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Muga-kontrola editatu"
@@ -23467,5 +23686,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Heskai"
@@ -23476,22 +23695,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Hesia"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "hesia"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "egurrezko hesia"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "alanbrezko hesia"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Horma"
@@ -23499,5 +23718,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Harresia"
@@ -23506,5 +23725,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Euste-horma"
@@ -23515,10 +23734,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Sarrera"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Sarrera editatu"
@@ -23526,5 +23745,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Atea"
@@ -23532,50 +23751,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Atea editatu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Hesia"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Hesia editatu"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Sare-metalikodun atea"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Sare-metalikodun atea editatu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Kolpe-atea (kolpe batekin irekitzen diren ateak)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Kolpe-atea (kolpe batekin irekitzen diren ateak) editatu"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Ate-birakorra"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Ate-birakorra editatu"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Eskailera (hesi edo langa gainetik pasatzeko)"
@@ -23583,25 +23802,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Eskailera (hesi edo langa gainetik pasatzeko)  editatu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Tornua"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Tornua editatu"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Ate-bikoitza"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Ate-bikoitza editatu"
@@ -23609,25 +23828,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Ura"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Iturburua"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Iturbura editatu"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Isurbidea"
@@ -23635,10 +23843,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Isurbidea editatu"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Erretena"
@@ -23646,10 +23854,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Erretena editatu"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Errekastoa"
@@ -23657,10 +23865,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Errekastoa editatu"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanala"
@@ -23668,10 +23876,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Kanala editatu"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Ibaia"
@@ -23681,59 +23889,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Ibaia editatu"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Iturburua"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Iturbura editatu"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Ur-jauzia"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Ur-jauzia editatu"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena)"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena) editatu"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Presa"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Presa editatu"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Arroa"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Arroa editatu"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Urtegia"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Urtegia editatu"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Estalitako urtegia"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Estalitako urtegia editatu"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Urazala editatu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Lurrazala"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Lurrazala editatu"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Arroa"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Arroa editatu"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Urtegia"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Urtegia editatu"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Estalitako urtegia"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Estalitako urtegia editatu"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Kostaldea"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Kostaldea editatu"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Ibaiertza"
@@ -23742,10 +24004,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Ibaiertza editatu"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Hezegunea"
@@ -23756,14 +24019,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Hezegunea editatu"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "zingira"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "zingira"
@@ -23777,35 +24040,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "padura"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "ihitoki"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "gatz-lurra"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "marea-gunea"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangladia"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Lokatza"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Lokatza editatu"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Hondartza"
@@ -23813,20 +24076,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Hondartza editatu"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Badia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Badia editatu"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Itsaslabarrak"
@@ -23834,145 +24097,214 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Itsaslabarrak editatu"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Kostaldea"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Kostaldea editatu"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Erosketak"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Ferry terminala"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Ferry terminala editatu"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+msgid "Cargo"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "hasiberria"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bizikleta"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ferry-bidea"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Ferrya editatu"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Ontziola"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Ontziola editatu"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Moila"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Moila editatu"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Presa"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Presa editatu"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Ibaiko bidearen nodoa"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Kirol-portua"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Kirol-portua editatu"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Ontziralekua"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Ontzilarekua editatu"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Esklusa"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena)"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena) editatu"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Ur-jauzia"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Ur-jauzia editatu"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Biratze-puntua"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Kirol-portua"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Kirol-portua editatu"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Ontziralekua"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Ontzilarekua editatu"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Ferry terminala"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Ferry terminala editatu"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Arrapala"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23982,16 +24314,38 @@
 msgstr "Arrapala editatu"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Ontziola"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Ontziola editatu"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Moila"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Moila editatu"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Garraioa"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Trenbidea"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Trena"
@@ -23999,5 +24353,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Trena editatu"
@@ -24027,7 +24381,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Zabalera (mm)"
@@ -24043,8 +24397,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Motak"
@@ -24058,29 +24412,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "hildako-bidea"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "Adarra"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elektrifikatua"
@@ -24093,8 +24447,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "kontaktu-bidea"
@@ -24165,8 +24519,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24178,8 +24532,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Tentsioa"
@@ -24192,8 +24546,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frekuentzia (Hz)"
@@ -24206,23 +24560,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Trenbide estua"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Trenbide estua editatu"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monoraila"
@@ -24230,50 +24584,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Monoraila editatu"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Mantenduta"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Trenbide historikoa editatu"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Tren-arina"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Tren-arina editatu"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metroa"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Metroa editatu"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tranbia"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Tranbia editatu"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Autobusarentzako bidea"
@@ -24281,5 +24635,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Autobusarentzako bidea editatu"
@@ -24288,10 +24642,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Erabilpenik gabeko trenbidea"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Erabilpenik gabeko trenbidea editatu"
@@ -24300,9 +24654,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Aukerako motak"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Utzitako trenbidea"
@@ -24311,5 +24665,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Trenbide-pasagunea"
@@ -24318,5 +24672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Pasagunea"
@@ -24326,5 +24680,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Pasabide mota"
@@ -24332,5 +24686,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Biraketa-plataforma"
@@ -24339,5 +24693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Bidearen topea"
@@ -24346,10 +24700,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Erremonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Teleaulkia"
@@ -24357,10 +24711,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Teleaulkia editatu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Teleskia"
@@ -24368,10 +24722,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Teleskia editatu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Telekabina"
@@ -24379,10 +24733,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Telekabina editatu"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondola"
@@ -24390,10 +24744,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Gondola editatu"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24402,5 +24757,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24408,5 +24763,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24415,5 +24770,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24421,5 +24776,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Erregaia"
@@ -24429,69 +24784,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Erregaia editatu"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "hondarra"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shel"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Independientea"
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24508,34 +24886,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24543,37 +24922,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Irekiera-ordutegia"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24594,33 +24984,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24629,170 +25021,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Astelehenetik ostiralera 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "Kioskoarekin"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Janari-denda"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kioskoa"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Erregai motak"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesela"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Biodiesela"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Kamioi handientzako diesela"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 oktano"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 oktano"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 oktano"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 oktano"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (%10eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (%85eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPF (Petroliotik likidotutako gasa)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Konprimitutako Gas Naturala)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24800,4 +25214,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24809,6 +25224,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Aparkalekua"
@@ -24817,5 +25232,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Aparkalekua editatu"
@@ -24826,25 +25241,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Erreferentzia zenbakia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "hainbat solairuduna"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "kanpoan"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "lurrazpian"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Aparkatu eta gidatu"
@@ -24853,54 +25270,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Ordainpekoa"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Gaitasuna (orotara)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Gutxituentzako lekuak"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Emakumeentzako lekuak"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Gurasoentzako lekuak"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Beste edukiera batzuentzako Wikia ikusi: [types]=*"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Garbiketa"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Autoen garbiketa editatu"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Auto kontzesionarioa"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Auto kontzesionarioa editatu"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Konponketa"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Autoen konponketa editatu"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Motak"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Zuhaitza editatu"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Edukia"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefono Zenbakia"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Alokairua"
@@ -24909,10 +25470,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Alokairuko autoa editatu"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Partekatzea"
@@ -24920,28 +25480,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Auto-partekatzea editatu"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Bizikleten aparkalekua editatu"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Edukiera"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motozikleta"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Autobidea editatu"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Zerbitzuak"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Gorde"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "txarra"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Aurrezarpenak"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Arropak"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Bizikleten aparkalekua editatu"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Edukiera"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Bizikleta-denda"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Bizikleta-denda editatu"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Bizikleten alokairua editatu"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24951,5 +25570,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24957,5 +25576,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Erreferentzia"
@@ -24963,5 +25582,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Trenaren geralekua"
@@ -24969,5 +25588,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Geralekua editatu"
@@ -24975,5 +25594,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tranbiaren-geralekua"
@@ -24982,5 +25601,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Tranbia-geralekua editatu"
@@ -24988,5 +25607,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Trenbideko nasa"
@@ -24995,5 +25614,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Trenbideko nasa editatu"
@@ -25005,5 +25624,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Erreferentzia (pista zenbakia)"
@@ -25011,10 +25630,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Azalera"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Metro-sarrera"
@@ -25023,10 +25642,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Metroaren sarrera editatu"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Gurpildun aulkia"
@@ -25035,5 +25654,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Autobus-estazioa"
@@ -25042,5 +25661,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Autobus-estazioa editatu"
@@ -25048,5 +25667,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Autobus-gelakua"
@@ -25056,13 +25675,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Autobus-geralekua editatu"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Babeslekua"
@@ -25070,19 +25688,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Jarlekua"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Ukimen-zola"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Autobusaren plataforma"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Autobusaren plataforma editatu"
@@ -25090,5 +25708,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxia"
@@ -25096,5 +25714,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Taxi-geltokia editatu"
@@ -25102,10 +25720,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aireportua"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Aireportu-eremua"
@@ -25113,5 +25731,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Aireportu-eremua editatu"
@@ -25119,10 +25737,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25131,5 +25749,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Pista"
@@ -25137,5 +25755,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Pista editatu"
@@ -25143,5 +25761,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Errodaje-pista"
@@ -25149,5 +25767,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Errodaje-pista editatu"
@@ -25155,5 +25773,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Heliportua"
@@ -25161,5 +25779,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Heliportua editatu"
@@ -25169,5 +25787,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Gelditzeko-plataforma"
@@ -25177,5 +25795,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25186,6 +25804,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Baliza"
@@ -25195,5 +25813,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Haize-mahuka"
@@ -25202,5 +25820,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminala"
@@ -25208,5 +25826,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Terminala editatu"
@@ -25214,15 +25832,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Terminaleko atea editatu"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Bidaiak"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Ostatuak"
@@ -25234,5 +25852,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25241,5 +25859,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Hotela editatu"
@@ -25252,8 +25870,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Izarrak"
@@ -25277,34 +25895,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25318,168 +25936,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminala"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefono Zenbakia"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motela"
@@ -25487,20 +26010,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Motela editatu"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Pentsioa"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Pentsioa editatu"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Bungalowa"
@@ -25508,10 +26031,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Bungalowa editatu"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Aterpetxea"
@@ -25519,30 +26042,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Aterpetxea editatu"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Mediko aterpea"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Mendiko aterpea editatu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Karabanentzako kanpalekua"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Karabanentzako kanpalekua editatu"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Kanpalekua"
@@ -25550,10 +26074,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Kanpalekua editatu"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Janaria+Edariak"
@@ -25564,5 +26088,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Jatetxea"
@@ -25570,5 +26094,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Jatetxea editatu"
@@ -25576,5 +26100,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Sukaldaritza"
@@ -25582,79 +26108,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "txinatarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizzeria"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hanburgesategia"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "greziarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "alemaniarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "bertakoa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turkiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thailandiarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexikarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japoniarra"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "frantsesa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich-a"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi-a"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Otordu lasterreko jatetxea"
@@ -25662,18 +26188,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Otordu lasterreko jatetxea editatu"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish and chips (arraina eta pataten jatetxea)"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "oilaskoa"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25681,10 +26207,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kafetegia"
@@ -25692,10 +26218,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Kafetegia editatu"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25703,20 +26234,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Pub-a editatu"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Biergarten-a editatu"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Taberna"
@@ -25724,10 +26255,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Taberna editatu"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Diskoteka"
@@ -25735,25 +26266,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Diskoteka editatu"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismoa"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Erakarpena"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Erakarpena editatu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museoa"
@@ -25761,9 +26292,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Museoa editatu"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -25772,9 +26303,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Zooa editatu"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Jolas-parkea"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Jolas-parkea editatu"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Artelana"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Artelana editatu"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Ikuspegi-gunea"
@@ -25782,50 +26334,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Ikuspegi-gunea editatu"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Zelata-dorrea"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Jolas-parkea"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Jolas-parkea editatu"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Artelana"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Artelana editatu"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Aterpea editatu"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Barbakoa"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Piknik-gunea"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Piknik-gunea editatu"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Informazio bulegoa"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Xehetasun-maila"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topografiko"
@@ -25863,5 +26416,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25869,28 +26422,28 @@
 msgstr "kalea"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "eskema"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Erakutsitako ingurua"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "gunea"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "hiria"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "erregioa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Deskribapen zehatzagoa"
@@ -25900,5 +26453,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Erakutsitako bideak:"
@@ -25906,5 +26459,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Mendi-ibiliak"
@@ -25912,6 +26465,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Txirrindularitza"
@@ -25919,5 +26472,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mendi-bizikleta"
@@ -25925,6 +26478,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Eskia"
@@ -25932,5 +26485,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Zaldiketa"
@@ -25938,46 +26491,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... beste garraio mota batzuk aukeran"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informazio-panela"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Iragarki-taula"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "oharra"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "basa-bizitza"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "landareak"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Informazio-zutoina"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25986,5 +26539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informazio-gunea"
@@ -25992,55 +26545,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Deskribapen zehatza"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audiogida"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Telefono mugikor bidezko audiogida?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Telefono zenbakia"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Beste informazio gune batzuk"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Aterpea editatu"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Barbakoa"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Piknik-gunea"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Piknik-gunea editatu"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Gune historikoak"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Gaztelua"
@@ -26049,19 +26581,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Gaztelua editatu"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Hondakinak"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Hondakinak editatu"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Gune-arkeologikoa"
@@ -26070,9 +26602,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Gune-arkeologikoa editatu"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Gudu-zelaia"
@@ -26080,10 +26612,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Gudu-zelaia editatu"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Gune-paleontologikoa"
@@ -26091,5 +26623,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Gune-paleontologikoa editatu"
@@ -26097,15 +26629,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumentua"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Monumentua editatu"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Oroitarria"
@@ -26113,55 +26645,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Oroitarria editatu"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Gurutzadura"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Gurutzadura editatu"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Santutxoa"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Santutxoa editatu"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Mugarria"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Mugarria editatu"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Aisia"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Ur-jolasen parkea"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Ur-jolasen parkea editatu"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Jolastokia"
@@ -26169,35 +26701,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Jolastokia editatu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Arrantza"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Arrantza editatu"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Kirolak"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Kirol-instalazioak"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Estadioa"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Estadioa editatu"
@@ -26211,6 +26743,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "aukeratu kirola:"
@@ -26626,6 +27158,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26660,240 +27192,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "arku-tiroa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletismoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "futbol australiarra"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "beisbola"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "saskibaloia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "bola-jokoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "alpinismoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "Saredun-cricketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croqueta"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "txirrindularitza"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "txakur-lasterketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "hipika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golfa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockeya"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "zaldi-lasterketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motorra"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "euskal pilota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "erraketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skate-a"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "patinajea"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "eskia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "futbola"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "igeriketa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "ping-pong-a"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenisa"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Kiroldegia"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Kiroldegia editatu"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Kirol-zelaia"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Kirol-zelaia editatu"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Lasterketa-pista"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Lasterketa-pista editatu"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf-zelaia"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Golf-zelaia editatu"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolfa"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Minigolfa editatu"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Kirola"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Multi"
@@ -26910,5 +27442,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26935,23 +27466,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "mota"
@@ -26968,5 +27507,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26993,211 +27531,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "zelaia"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "kiroldegia"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "estadioa"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bola-jokoa"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletismoa"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Atletismoa editatu"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Arku-tiroa"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Arku-tiroa editatu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Alpinismoa"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Alpinismoa editatu"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Piraguismoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Piraguismoa editatu"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Txirrindularitza editatu"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Txakur-lasterketak"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Txakur-lasterketak editatu"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Hipika"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Hipika editatu"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Zaldi-lasterketak"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Zaldi-lasterketak editatu"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Gimnasia editatu"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motor-kirolak"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Motor-kirolak"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Patinajea"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Patinajea editatu"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skate-a"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Skate-parkea editatu"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Igeriketa"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Igeriketa editatu"
@@ -27205,52 +27746,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Eskia editatu"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Eski-pista mota"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "jaitsiera"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nordikoa"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snowboard parkea"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Zailtasuna"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "hasiberria"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "erraza"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "aurreratua"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "aditua"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "pistatik kanpo"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Tiro"
@@ -27258,204 +27799,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Tiro-a editatu"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Kirolak (pilota-kirolak)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Futbola"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Futbola editatu"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Futbol australiarra"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Futbol australiarra editatu"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Beisbola"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Beisbola editatu"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Saskibaloia"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Saskibaloia editatu"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golfa"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Golfa editatu"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf-zelaia"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boulea"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Boulea editatu"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bola-jokoa"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket-a"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Cricket-a editatu"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Saredun-cricket-a"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Saredun-cricket-a editatu"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet-a"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Croquet-a editatu"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey-a"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Hockey-a editatu"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Frontoia (Euskal pilota)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Frontoia (Euskal pilota) editatu"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Erraketa"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Erraketa editatu"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Ping-pong-a editatu"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Tenisa editatu"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motor-kirolak"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Motor-kirolak"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Kontuz"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Aparkalekua editatu"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Automobil"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Motor-kirolak"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Patinajea editatu"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Muga-kontrola editatu"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Telekabina"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Telekabina editatu"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Gizakiak-eraikia"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Eraikina"
@@ -27463,5 +28070,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Eraikin-publikoa"
@@ -27469,10 +28076,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Eraikin-publikoa editatu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Udaletxea"
@@ -27480,10 +28087,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Udaletxea editatu"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Enbaxada"
@@ -27491,10 +28098,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Enbaxada editatu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Epaitegia"
@@ -27503,10 +28110,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Epaitegia editatu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Gartzela"
@@ -27515,10 +28122,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Gartzela editatu"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polizia"
@@ -27528,10 +28135,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Polizia editatu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Suhiltzaile-etxea"
@@ -27540,10 +28147,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Suhiltzaile-etxea editatu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postetxea"
@@ -27551,5 +28158,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Postetxea-editatu"
@@ -27557,15 +28164,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Haurreskola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Haurreskola editatu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Eskola"
@@ -27573,10 +28180,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Eskola editatu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Unibertsitatea"
@@ -27584,10 +28191,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Unibertsitatea editatu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Batxilergo-eskola"
@@ -27595,5 +28202,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Batxilergo-eskola editatu"
@@ -27601,5 +28208,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Zinema"
@@ -27608,10 +28215,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Zinema editatu"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Liburutegia"
@@ -27620,9 +28227,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Liburutegia editatu"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Arte zentrua"
@@ -27630,10 +28237,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Arte zentrua editatu"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Antzokia"
@@ -27642,10 +28249,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Antzokia editatu"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Gurtze-lekua"
@@ -27655,5 +28262,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Gurtze-lekua editatu"
@@ -27662,6 +28269,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Erlijioa"
@@ -27670,66 +28277,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kristaua"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindua"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "musulman"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sij"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrika"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Sinesmena"
@@ -27738,189 +28345,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katoliko"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "ebanjeliko"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Jehovaren lekukoak"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormoi"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentekostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kuakero"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "xii"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "suni"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Helbideak"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Helbideak editatu"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Eraikinaren atari zenbakia"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Eraikinaren izena"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Kale-izena"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Hiriaren izena"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Posta-kodea"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Estatuaren kodea"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Helbideen Interpolazioa editatu"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Zenbakien-eskema"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "bakoitia"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "bikoitia"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabetiko"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Gizakiak eraikia"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Lantokia"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Lantokia editatu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Dorrea"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Dorrea editatu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Dorre mota"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "komunikazioa"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "behaketa"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Altuera (metrotan)"
@@ -27928,25 +28465,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Ur-dorrea"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Ur-dorrea editatu"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Itsasargia"
@@ -27954,10 +28491,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Itsasargia editatu"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Haize-errota"
@@ -27965,10 +28502,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Haize-errota editatu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Hodiak"
@@ -27977,41 +28514,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Hodiak editatu"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gasa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "termikoa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "olioa"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "hondakin-ura"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "edozein substantzia"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Kokapena"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "urperatua"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "lurrazalean"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
@@ -28021,10 +28558,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Garabia"
@@ -28032,5 +28569,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Garabia editatu"
@@ -28038,10 +28575,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Baliza editatu"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Erpin geodesikoa"
@@ -28049,10 +28586,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Erpin geodesikoa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Zaintza-kamera"
@@ -28060,23 +28597,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Zaintza-kamera editatu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "barruko"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "kanpoko"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "publikoa"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Energia-sorgailua"
@@ -28086,35 +28623,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Energia sorgailua editatu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "haizea"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hidrauliko"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuklear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "ikatza"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltaiko"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Zentral elektrikoa"
@@ -28123,10 +28660,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Zentral elektrikoa editatu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Azpiestazio elektrikoa"
@@ -28135,5 +28672,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Azpiestazio elektrikoa editatu"
@@ -28141,10 +28678,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Linearen erreferentzia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Elektrizitate-dorrea"
@@ -28155,23 +28692,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Elektrizitate-dorrea editatu"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "dorrea"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "postea"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Dorrearen erreferentzia"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Linea elektrikoa"
@@ -28180,20 +28717,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Linea elektrikoa editatu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Linea mota"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28201,55 +28738,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Kable kopurua"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Alanbre kopurua (eroale hobea) kable elektriko bakoitzeko"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "bakuna"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "bikoitza"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "hirukoitza"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Zerbitzuak"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Komunak"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "mugatua"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Oharra"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Gutunontzia"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefonoa"
@@ -28258,5 +28795,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Telefonoa editatu"
@@ -28264,5 +28801,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Txanponak"
@@ -28270,5 +28807,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Oharrak"
@@ -28276,5 +28813,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Errekarga-txartelak eta diru-zorro elektronikoak"
@@ -28282,5 +28819,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debitu-txartelak"
@@ -28288,15 +28825,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditu-txartelak"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefono-txartelak"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Birziklapena"
@@ -28305,5 +28842,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Birziklatze-gunea editatu"
@@ -28311,35 +28848,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Bateria"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Ontziak"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Arropak"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Beira"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papera"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Txatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Paperontzia"
@@ -28347,5 +28879,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Paperontzia editatu"
@@ -28354,31 +28886,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Aulkiaren bizkarraldea"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiala"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "harria"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastikoa"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Kolorea"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "beltza"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marroia"
@@ -28457,5 +28989,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28465,31 +28997,31 @@
 msgstr "berdea"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "gorria"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "urdina"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "grisa"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "zuria"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Jarleku kopurua"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Ehiza-postua"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Ehiza-postua editatu"
@@ -28497,31 +29029,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Garaiera"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "baxua"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "erdia"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "beteta"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Esklusa"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Iturria"
@@ -28530,10 +29062,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Iturria editatu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Iturria (edateko ona)"
@@ -28542,10 +29074,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Iturria (edateko ona) editatu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Suteentzako hidrantea"
@@ -28554,5 +29086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Suteentzako hidrantea editatu"
@@ -28560,314 +29092,305 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "egurra"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermerkatua"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Supermerkatua editatu"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Janari-denda"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Janari-denda editatu"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kioskoa"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Kioskoa editatu"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Harategia"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Harategia editatu"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Okindegia"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Okindegia editatu"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Produktu organikoen denda"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Produktu organikoen denda"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alkohola"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Alkoholdun edarien denda editatu"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Edariak"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Edari-denda editatu"
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Dendak"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Auto kontzesionarioa"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Auto kontzesionarioa editatu"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Bizikleta-denda"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Bizikleta-denda editatu"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermerkatua"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Supermerkatua editatu"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr "Botika"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr "Botika editatu"
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Janari-denda"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Janari-denda editatu"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kioskoa"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Kioskoa editatu"
-
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Ileapaindegia"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Ileapaindegia editatu"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optika"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Optika editatu"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Ordenagailu-denda editatu"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Zapatak"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Zapata-denda editatu"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Kanpoko aktibitateen denda"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Kanpoko aktibitateen denda editatu"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Kiroldenda editatu"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Tindategia"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Tindategia editatu"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Garbitegia"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Garbitegia editatu"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "trenbide bat baino gehiago gurutzatzen diren lekua"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Trena editatu"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Ordenagailua"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Ordenagailu-denda editatu"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Elektronika-denda editatu"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "HI-FI"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "HI-FI denda editatu"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Bideoa"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Bideo-denda editatu"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Loradenda"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Loradenda editatu"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Lorezaintza zentrua"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Lorezaintza zentrua editatu"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Burdindegia"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Burdindegia editatu"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Brikolaje-denda"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Brikolaje denda editatu"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Altzariak"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Altzari-denda editatu"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Paper-denda"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Paper-denda editatu"
+
+#: build/trans_presets.java:3010
 msgid "Book Store"
 msgstr "Liburudenda"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:3011
 msgid "Edit Book Store"
 msgstr "Liburudenda editatu"
 
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:3016
 msgid "Travel Agency"
 msgstr "Bidaia-agentzia"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:3017
 msgid "Edit Travel Agency"
 msgstr "Bidaia-agentzia editatu"
 
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Harategia"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Harategia editatu"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Okindegia"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Okindegia editatu"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Loradenda"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Loradenda editatu"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Produktu organikoen denda"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Produktu organikoen denda"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alkohola"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Alkoholdun edarien denda editatu"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Edariak"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Edari-denda editatu"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Ordenagailua"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Ordenagailu-denda editatu"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Elektronika-denda editatu"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "HI-FI"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "HI-FI denda editatu"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Altzariak"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Altzari-denda editatu"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Lorezaintza zentrua"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Lorezaintza zentrua editatu"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Burdindegia"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Burdindegia editatu"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Brikolaje-denda"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Brikolaje denda editatu"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Paper-denda"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Paper-denda editatu"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Ileapaindegia"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Ileapaindegia editatu"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Zapatak"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Zapata-denda editatu"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr "Jostailuak"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "Jostailu-denda editatu"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Bideoa"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Bideo-denda editatu"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Tindategia"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Tindategia editatu"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Garbitegia"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Garbitegia editatu"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Kanpoko aktibitateen denda"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Kanpoko aktibitateen denda editatu"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Kiroldenda editatu"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optika"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Optika editatu"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Makina-saltzailea"
@@ -28875,5 +29398,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Makina-saltzailea editatu"
@@ -28881,97 +29404,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Produktuen makina-saltzailea"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "garraio publikoko txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "garraio publikoaren mapak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "aparkalekuko txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "Elikadura"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "edariak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "gozokiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "zigarretak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "argazkiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "animalientzako janaria"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "egunkariak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "jostailuak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "seiluak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "SIM txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "Telefono-txartelak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr "Bonuak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "kondoiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "tanpoiak"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr "gorotz-poltsa"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr "Fideltasun edo deskontu txartelak"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Dirua"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Banku"
@@ -28979,14 +29502,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Bankua editatu"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Kutxazain automatikoa"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Diru-trukea"
@@ -28994,5 +29517,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Diru-trukea editatu"
@@ -29000,15 +29523,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Kutxazain automatikoa editatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Osasuna"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "Medikuak"
@@ -29016,18 +29539,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "Medikuak editatu"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "Dentista editatu"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Botika"
@@ -29035,5 +29558,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Botika editatu"
@@ -29041,9 +29564,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr "Medikuaren errezetarekin saltzen dute"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Ospitalea"
@@ -29051,10 +29574,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Ospitalea editatu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua"
@@ -29063,5 +29597,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua editatu"
@@ -29070,15 +29604,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Puntu-zenbakia"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Puntuaren izena"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Erabili nazioarteko kodea, hala nola +12-345-67890)"
@@ -29086,5 +29620,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Albaitaria"
@@ -29093,368 +29627,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Albaitaria editatu"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Mugak"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nazionala"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Muga nazionala editatu"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administratiboa"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Muga administratiboa editatu"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Zibila"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Muga zibila editatu"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politikoa"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Muga politikoa editatu"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parke nazionala"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Parke nazionala editatu"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Lekuak"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinentea"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Kontinentea editatu"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Herrialdea"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Herrialdea editatu"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Estatua"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Estatua editatu"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Erregioa"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Erregioa editatu"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Eskualdea"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Eskualdea editatu"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Hiria (100.000 biztanle baino gehiago)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Hiria (100.000 biztanle baino gehiago) editatu"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Herria (10.000 - 100.000 biztanle)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Herria (10.000 - 100.000 biztanle) editatu"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Auzoa"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Auzoa editatu"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Herria (10.000 biztale baino gutxiago)"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Herria (10.000 biztale baino gutxiago) editatu"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak)"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak) editatu"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Ingurua (leku geografikoa)"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Ingurua (leku geografikoa) editatu"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Mendi-tontorra"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Mendi-tontorra editatu"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glaziarra"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Glaziarra editatu"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Sumendia"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Sumendia editatu"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Kobazuloaren sarrera"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Kobazuloaren sarrera editatu"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Irla"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Irla editatu"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Irlatxoa"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Irlatxoa editatu"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natura"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Zuhaitza"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Zuhaitza editatu"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Izen-botanikoa"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Basoa"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Basoa editatu"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "konifero"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "hostoerorkorra"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "misto"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Basoa"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Basoa editatu"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Natura-erreserba"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Natura-erreserba editatu"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Kobazuloaren sarrera"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Kobazuloaren sarrera editatu"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Mendi-tontorra"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Mendi-tontorra editatu"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glaziarra"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Glaziarra editatu"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Sumendia"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Sumendia editatu"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Mugak"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nazionala"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Muga nazionala editatu"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administratiboa"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Muga administratiboa editatu"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Zibila"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Muga zibila editatu"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politikoa"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Muga politikoa editatu"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parke nazionala"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Parke nazionala editatu"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Harritza"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Harritza editatu"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Sastraka"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Sastraka editatu"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Txilardi"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Txilardia editatu"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Lurzorua"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Zuhaitza"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Zuhaitza editatu"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Izen-botanikoa"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Basoa"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Basoa editatu"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "konifero"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "hostoerorkorra"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "misto"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Basoa"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Basoa editatu"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Natura-erreserba"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Natura-erreserba editatu"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Harritza"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Harritza editatu"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Sastraka"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Sastraka editatu"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Txilardi"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Txilardia editatu"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Etxaldea"
@@ -29463,45 +30003,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Etxalde-gunea editatu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Nekazaritza-lurra"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Nekazaritza-lurrak editatu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Belardia"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Mahastia"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Mahastia editatu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Soroak"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Soroak editatu"
@@ -29509,25 +30049,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Lorategia"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Lorategia editatu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Belarra"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Udal-parkea"
@@ -29535,10 +30075,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Udal-parkea editatu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Amankomuna"
@@ -29546,20 +30086,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Amankomuna editatu"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parkea"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Parkea editatu"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Aisialdi-gunea"
@@ -29567,5 +30107,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Aisialdi-gunea editatu"
@@ -29573,15 +30113,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Bizitegi-gunea"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Bizitegi-gunea editatu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Hilerria (txikia)"
@@ -29589,9 +30129,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Hilerria (txikia) editatu"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Hilerria"
@@ -29599,39 +30139,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Hilerria editatu"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Merkataritza"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Merkataritza-gunea editatu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Bulegoak"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Bulego-eremua editatu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industriala"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Industrialdea editatu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Trenbide-eremua"
@@ -29639,15 +30179,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Trenbide-eremua editatu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militarra"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Eremu militarra editatu"
@@ -29655,52 +30195,186 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Eraikitze-eremua"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Eraikitze-eremua editatu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Lugorria"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Lugorria editatu"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Eraikitzeko lurzorua"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Eraikitzeko lurzorua editatu"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Zabortegia"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Editatu zabortegia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Harrobia"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Harrobia editatu"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Estazioa"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Helbideak"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Helbideak editatu"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Eraikinaren atari zenbakia"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Eraikinaren izena"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Kale-izena"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Hiriaren izena"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Posta-kodea"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Estatuaren kodea"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "H"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Helbideen Interpolazioa editatu"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Zenbakien-eskema"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "bakoitia"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "bikoitia"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabetiko"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Edukia"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Egileari buruzko informazioa gehitu"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "Hasiera orria"
 
 #. item "Relations/Multipolygon"
@@ -29708,5 +30382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Multipoligonoa editatu"
@@ -29718,5 +30392,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "kanpoko segmentua"
@@ -29724,5 +30398,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "barruko segmentua"
@@ -29730,5 +30404,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Muga"
@@ -29739,5 +30413,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Muga editatu"
@@ -29745,36 +30419,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Muga mota"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administratiboa"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "nazionala"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "zibila"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "politikoa"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Maila administratiboa"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Azpi-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Administrazio gunea"
@@ -29782,5 +30456,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Biraketa debekua"
@@ -29789,5 +30463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Biraketa debekua editatu"
@@ -29795,34 +30469,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Debekua"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "ezkerrera biratzea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "eskuinera biratzea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "zuzen jarraitzea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "U biraketa egitea debekatua"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "soilik eskuinera biratzea"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "soilik ezkerrera biratzea"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "aurrerantz soilik"
@@ -29831,15 +30505,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "norabide honetatik"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "nodo edo bide honetan zehar"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "bide honetara"
@@ -29847,5 +30521,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Bidea"
@@ -29854,5 +30528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Bidea editatu"
@@ -29860,132 +30534,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Bide mota"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bizikleta"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "autobusa"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "errepidea"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -30053,5 +30616,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30061,9 +30624,9 @@
 msgstr "oinezkoa"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tranbia"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "desbideratzea"
@@ -30077,10 +30640,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroa"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Sinboloaren deskribapena"
@@ -30088,31 +30651,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Sarea"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Estatuko bidea"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proposatutako"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "txandakatu"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "behin-behineko"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "lotura"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Kolorea (hex)"
@@ -30121,30 +30684,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "ibilbidearen segmentua"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "hurrengo segmentua"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "aurreko segmentua"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "geldialdi puntua"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "hurrengo geldialdi puntua"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "aurreko geldialdi puntua"
@@ -34122,7 +34685,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34244,8 +34806,11 @@
 msgstr "Sizilia - Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Waterway Point"
+#~ msgstr "Ibaiko bidearen nodoa"
 
 #~ msgid "The selected way does not contain the selected node."
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 22859)
+++ applications/editors/josm/i18n/po/fi.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-14 00:21+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-29 17:56+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Varoitus"
@@ -105,5 +105,5 @@
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ohitetaan virheellinen URL-osoite: ”{0}”"
+msgstr "Jätetään huomiotta virheellinen URL-osoite: ”{0}”"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap -editori"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -151,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
-msgstr "Virheilmoitukset"
+msgstr "Virheraportit"
 
 #. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
@@ -169,5 +169,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
-msgstr "Versio"
+msgstr "Revisio"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
@@ -195,6 +195,7 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"API-rajapinnan URL poikkeaa odotetusta muodosta. OSM-alkioiden tieto- ja "
-"historiasivujen lataus ei luultavasti toimi. Nykyinen URL on \"{0}\""
+"VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. "
+"Aiheuttanee uudelleenohjauksen toimimattomuutta OSM-alkioiden tieto- tai "
+"historiasivuile. Sovellusrajapinnan URL-perusosoite on \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -204,6 +205,7 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"API-rajapinnan URL poikkeaa odotetusta muodosta. Käyttäjätietosivujen "
-"avaaminen epäonnistunee. Nykyinen URL on \"{0}\""
+"VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. "
+"Aiheuttanee uudelleenohjauksen toimimattomuutta OSM-alkioiden "
+"käyttäjätietosivuile. Sovellusrajapinnan URL-perusosoite on \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -213,6 +215,6 @@
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
-"Olet avaamassa {0} selainikkunaa.<br>Tämä saattaa täyttää näytön "
-"ikkunoilla<br>ja viedä jonkin verran aikaa."
+"Olet avaamassa {0} selainikkunaa.<br>Tämä saattaa sekä täyttää näytön "
+"selainikkunoilla<br>että viedä jonkin verran aikaa."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -225,5 +227,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr "Avaa {0} selainikkunaa."
+msgstr "Valitse jatkaaksesi ja avataksesi {0} selainikkunaa."
 
 #. Strings in JFileChooser
@@ -238,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -246,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -252,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -267,5 +269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -277,5 +279,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -300,5 +302,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -409,4 +411,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -424,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -479,5 +482,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
 msgid "data"
-msgstr "dataan"
+msgstr "tietoihin"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
@@ -509,5 +512,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
 msgid "Nothing selected to zoom to."
-msgstr "Ei mitään valittuna"
+msgstr "Ei mitään valittuna näkymän sovittamiseksi"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120
@@ -1046,5 +1049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1053,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1064,5 +1067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1463,20 +1466,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Purge..."
-msgstr ""
+msgstr "Pyyhi"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Forget objects but do not delete them on server when uploading."
-msgstr ""
+msgstr "Unohda kohteita mutta älä poista niitä palvelimelta lähetettäessä."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+msgstr "Pyyhi"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+msgstr "Vahvista puhdistus"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1484,24 +1487,30 @@
 "uploading."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+"Tämä toiminto laittaa JOSMin unohtamaan valitut kohteet.<br> Ne poistetaan "
+"tasolta, mutta <i>ei</i> palvelimelta lähetettäessä."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
 "selected objects:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+"Seuraavat riippuvaiset kohteet puhdistetaan<br> näiden valittujen kohteiden "
+"lisäksi:"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+msgstr "Lisää valintaan"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
 "discarded.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+"Joitain kohteita on muokattu.<br> Jatka jos nämä muutokset tulee hukata.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
-msgstr ""
+msgstr "Tyhjennä Peruuta/Tee uudelleen toimintojen tapahtumat"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1533,8 +1542,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1543,9 +1552,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1561,6 +1570,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1570,5 +1579,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1593,6 +1602,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Virhe"
@@ -1753,5 +1762,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Ei, peruuta"
@@ -1835,4 +1844,5 @@
 "The current selection cannot be used for splitting - no node is selected."
 msgstr ""
+"Nykyistä valintaa ei voida käyttää jakamiseen - pistettä ei ole valittu."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2039,5 +2049,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2141,5 +2151,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
 msgid "Toggle Wireframe view"
-msgstr "Vaihda rautalankanäkymän päälläoloa"
+msgstr "Rautalankanäkymä päälle/pois"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
@@ -2523,5 +2533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2565,9 +2575,9 @@
 "Haluatko varmasti siirtää ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2576,9 +2586,9 @@
 "yhdistääksesi lähimpään pisteeseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2866,5 +2876,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Etsi"
@@ -3070,7 +3080,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3312,4 +3322,6 @@
 "because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
+"Olet aikeissa poistaa keskeneräisiä kohteita.<br>Tämä aiheuttaa ongelmia "
+"koska et näe todellista kohdetta.<br>Haluatko aivan varmasti poistaa?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3340,11 +3352,11 @@
 msgstr[1] "Siirrä {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Tuhottiin {0} kohde"
-msgstr[1] "Tuhottiin {0} kohdetta"
+msgstr[0] "Pyyhittiin {0} kohde"
+msgstr[1] "Pyyhittiin {0} kohdetta"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
@@ -3352,5 +3364,5 @@
 #, java-format
 msgid "Purged object ''{0}''"
-msgstr "Kohde \"{0}\" tuhottiin"
+msgstr "Kohde \"{0}\" pyyhittiin"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
@@ -3496,34 +3508,38 @@
 msgstr "Automaattinen tagien korjaus"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+"Kirjaston {0} luonti epäonnistui, automaattinen tallennus on pois päältä"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+msgstr "Tiedoston {0} luonti epäonnistui, käytetään toista toedoston nimeä"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+"Luku / kirjoitusvirhe tiedoston luonnissa, automaattinen tallennus "
+"ohitetaan: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+msgstr "Vanhan varmuuskopion poisto ei onnistu {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+msgstr "Virhe poistetun tason varmuuskopion luonnissa {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
 msgstr ""
+"Automaattisesti tallennettun osm-tiedon lukeminen ei onnistu ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3539,15 +3555,15 @@
 msgstr "Virheellinen pituuspiiri ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3558,5 +3574,5 @@
 "hakemisto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3567,5 +3583,5 @@
 "hakemisto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3576,5 +3592,5 @@
 "voitu luoda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3585,5 +3601,5 @@
 "voitu luoda: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3593,5 +3609,5 @@
 "asetustiedosto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3602,5 +3618,5 @@
 "asetustiedostolla."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3611,5 +3627,5 @@
 "palauttaa oletusarvoihin: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3620,5 +3636,5 @@
 "<br> ja luodaan uusi oletusarvoinen asetustiedosto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3629,10 +3645,10 @@
 "palauttaa oletusarvoihin: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Virhe: Odottamaton rivi \"{0}\" kirjanmerkkitiedostossa \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3717,5 +3733,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "ast° min'' sek\""
 
 #. *
@@ -3759,5 +3775,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3786,4 +3802,6 @@
 "the source dataset"
 msgstr ""
+"Kohde tyyppiä {0} tunnuksella {1} oli merkitty poistettavaksi, mutta se "
+"puuttuu lähdetiedoista"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
@@ -3815,4 +3833,6 @@
 msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
+"Ristiriita 'visible' (näkyvä) attribuutissa kohteelle jonka tyyppi on {0} ja "
+"tunniste {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3832,12 +3852,12 @@
 "{0}"
 msgstr ""
-"Uuden objektin muutosjoukon tunnisteen pitää olla 0, mutta annettu tunniste "
-"oli {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+"Uuden objektin muutoskokoelman tunnisteen pitää olla 0, mutta annettu "
+"tunniste oli {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Objekti, jonka tunniste on 0, ei voi olla näkymätön"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3846,5 +3866,5 @@
 "Objekteja ei voi yhdistää, koska jompikumpi niistä on uusi, mutta toinen ei"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4039,15 +4059,34 @@
 msgstr "PUWG 2000 -alue {0} (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveitsi)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM-alue"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "etelä"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Siirry"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4071,9 +4110,9 @@
 msgstr "Guayana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM Ranska (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "UTM-karttajärjestelmä"
@@ -4118,5 +4157,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "rata"
@@ -4137,5 +4176,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4390,69 +4429,69 @@
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "UNIX-standardin mukainen geometria"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Lataa rajattu alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Avaa tiedosto (mitä tahansa Tiedosto/Avaa-valikon tuntemaa tyyppiä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Lataa rajattu alue raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z) raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Valitse haun tulokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Käynnistä suurennettuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Aseta kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "Javan järjestelmäominaisuuksina näkyvät asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/polku/josmin/hakemistoon/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Vaihda kaikkien käyttäjäasetuksien kansio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4465,9 +4504,9 @@
 "Java-asetus, joka määrää suurimman käytettävän muistimäärän megatavuina."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4477,57 +4516,69 @@
 "järjestyksessä."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Muista ladata dataa, jos käytät --selection-valitsinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Alustetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Päivitetään liitännäisiä..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Asennetaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Ladataan liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+msgstr "Tallentamatonta osm-tietoa"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
-msgstr ""
+msgstr "Palauta"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "saari"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+"JOSM löysi {0} tallentamatonta osm tietotasoa. Näyttäisi että JOSM kaatui "
+"viimeksi. Haluatko palauttaa tiedot?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Asetus {0} on poistettu koska sitä ei enää tarvita."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4536,12 +4587,15 @@
 "version of JOSM.</li></ul>More Info:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+"<h2>JOSM vaatii Java version 6.</h2>Tunnistettu java versio: {0}.<br>Voit "
+"<ul><li>päivittää Java (JRE):n tai </li><li>käyttää aiempaa (Java 5 "
+"yhteensopivaa) versiota JOSMista.</li></ul>Lisää tietoa:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgstr "Poistu JOSMista"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
-msgstr ""
+msgstr "Jatka, yritä silti"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
@@ -4553,9 +4607,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4679,25 +4734,25 @@
 msgstr "Käyttäjä:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Tason \"{0}\" tulee olla tasolistassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+msgstr "Metrinen"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+msgstr "Kiinalainen"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
-msgstr ""
+msgstr "Imperiaalinen"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -4792,5 +4847,5 @@
 msgstr "Tästä voit sulkea ikkunan ja keskeyttää kohteiden poistamisen"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4800,17 +4855,17 @@
 "suurennostasolta.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Suurennostaso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "ruudusta"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "ruutuun"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4824,25 +4879,25 @@
 "i>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Ruutuosoite:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Toteuta ruutuosoite"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Syötä ruutuosoite"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Annettu ruutuosoite on väärää muotoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Syötä ruutuindeksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "Kyseinen arvo ei ole minkään ruudun indeksi annetulla suurennostasolla"
@@ -5246,5 +5301,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Ominaisuudet heidän tiedoissaan, t.s. palvelimen tiedot"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110
@@ -5254,16 +5309,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184
 msgid "Deleted State:"
-msgstr ""
+msgstr "Poistettu tila:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
 msgid "Referenced by:"
-msgstr ""
+msgstr "Viittaaja:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
-msgstr ""
+msgstr "(ei mitään)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309
@@ -5274,5 +5330,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311
 msgid "not deleted"
-msgstr ""
+msgstr "ei poistettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
@@ -5290,9 +5346,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445
 msgid "Keep my deleted state"
-msgstr ""
+msgstr "Pidä minun poistettu tilani"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460
 msgid "Keep their deleted state"
-msgstr ""
+msgstr "Pidä heidän poistettu tilansa"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475
@@ -5318,5 +5374,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59
 msgid "<undefined>"
-msgstr ""
+msgstr "<määrittelemätön>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36
@@ -5326,5 +5382,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Yhdistetyt tiedot eivät sisällä tagia avaimella {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
@@ -5332,5 +5388,5 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Minun tietoni eivät sisällä tagia avaimella {0}"
 
 #. setting up the properties table
@@ -5343,4 +5399,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5357,4 +5414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5370,17 +5428,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
 msgid "My version (local dataset)"
-msgstr ""
+msgstr "Minun versioni (paikalliset tiedot)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
 msgid "Their version (server dataset)"
-msgstr ""
+msgstr "Heidän versionsa (palvelimen tiedot)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
 msgid "Keep the selected key/value pairs from the local dataset"
-msgstr ""
+msgstr "Pidä valitut avain/arvoparit paikallisista tiedoista"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
 msgid "Keep the selected key/value pairs from the server dataset"
-msgstr ""
+msgstr "Pidä valitut avain/arvoparit palvelimen tiedoista"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
@@ -5396,5 +5454,5 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Heidän tietonsa eivät sisällä tagia avaimella {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
@@ -5410,9 +5468,9 @@
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
+msgstr "Ristiriitoja yhdistettäessä pisteitä - kohdepiste on \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
 msgid "No conflicts to resolve"
-msgstr ""
+msgstr "Ei ristiriitoja ratkaistavaksi"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
@@ -5424,24 +5482,24 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284
 msgid "Apply resolved conflicts"
-msgstr ""
+msgstr "Toteuta ratkaistut ristiriidat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
 msgid "Apply"
-msgstr ""
+msgstr "Toteuta"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ei mitään"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "kaikki"
@@ -5449,19 +5507,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66
 msgid "Choose a value"
-msgstr ""
+msgstr "Valitse arvo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Valitse mitkä arvot pidetään"
 
 #: ../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 "Arvo \"{0}\" tullaan toteuttamaan avaimelle \"{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 "Avain \"{0}\" ja kaikki sen arvot tullaan poistamaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
@@ -5469,9 +5527,10 @@
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
 msgstr ""
+"Kaikki arvot jotka on liitetty \"{0}\" tullaan toteuttamaan avaimelle \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
 #, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr ""
+msgstr "Tagikokoelma ei sisällä valittua arvoa \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135
@@ -5480,36 +5539,36 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:267
 msgid "Not decided yet."
-msgstr ""
+msgstr "Ei päätetty vielä"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Tageja pisteistä"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Tageja poluista"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Tageja relaatioista"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
+msgstr "Ristiriidat liitetyissä tageissa"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
 msgid "Paste ..."
-msgstr ""
+msgstr "Liitä ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
 msgid "From ..."
-msgstr ""
+msgstr "Kohteesta ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
 msgid "To ..."
-msgstr ""
+msgstr "Kohteeseen ..."
 
 #. minimum size is relevant for multisplit layout
@@ -5519,9 +5578,9 @@
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} tagi"
+msgstr[1] "{0} tagia"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5533,5 +5592,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5552,5 +5611,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Keep"
-msgstr ""
+msgstr "Pidä"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
@@ -5560,23 +5619,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
 msgid "Undecided"
-msgstr ""
+msgstr "Päättämätön"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 msgid "Not decided yet"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+msgstr "Ei päätetty vielä"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+msgstr "Rooli:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+msgstr "Syötä rooli kaikille relaation jäsenille"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5585,26 +5644,26 @@
 "<html>Asettaa annetun avaimen<br>kaikkiin muutettuihin relaatioihin.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
-msgstr ""
-
+msgstr "Avain:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
 msgid "Value:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+msgstr "Arvo:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5622,5 +5681,5 @@
 "alkuperäisen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5638,27 +5697,27 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Toteuta tämä rooli kaikkiin jäseniin"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr ""
+msgstr "Alkp. Polk."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
 msgid "Decision"
-msgstr ""
+msgstr "Päätös"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
 msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr ""
+msgstr "<html>Valitse arvot jotka pidetään seuraaville tageille.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
 msgid "Show tags with conflicts only"
-msgstr ""
+msgstr "Näytä vain tagit joissa ristiriitoja"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
 msgid "Show tags with multiple values only"
-msgstr ""
+msgstr "Näytä vain tagit joissa useita arvoja"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
@@ -5705,5 +5764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
 msgid "Show info"
-msgstr ""
+msgstr "Näytä tiedot"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417
@@ -5755,4 +5814,6 @@
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr ""
+"Valitsee kohteet jotka ottavat osaa tähän komentoon (paitsi jos tällä "
+"hetkellä poistettuna)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
@@ -5780,11 +5841,14 @@
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
+"Avaa yhdistämiskehotteen kaikista valituista kohteista ylläolevalle listalle."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
+"Asettaa valitut elementit kartalle valittuihin kohteisiin ylläolevalle "
+"listalle."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191
@@ -5794,17 +5858,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
 msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
+msgstr "Toteuta ratkaistut ristiriidat ja sulje kehote"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
 msgid "Apply Resolution"
-msgstr ""
+msgstr "Toteuta ratkaisu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237
 msgid "Close anyway"
-msgstr ""
+msgstr "Sulje siltikin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
 msgid "Continue resolving"
-msgstr ""
+msgstr "Jatka ratkaisemista"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240
@@ -5817,8 +5881,13 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
+"<html>Et ole vienyt loppuun eroavaisuuksien yhdistämistä tässä ristiriidassa."
+"<br>Ristiriidan ratkaisuja ei toteuteta ellei kaikkia eroavaisuuksia<br>ole "
+"ratkaistu.<br>Valitse <strong>{0}</strong> sulkeaksesi kaikesta huolimatta."
+"<strong> Jo<br>ratkaistuja eroavaisuuksia ei toteuteta.</strong><br>Valitse "
+"<strong>{1}</strong> palataksesi ratkaisemaan ristiriitoja.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Ristiriita ei ratkennut kokonaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281
@@ -5829,5 +5898,5 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Ratkaise ristiriidat kohteelle \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
@@ -5889,9 +5958,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr ""
+msgstr "Virhe suodattimessa"
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5899,5 +5968,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5905,5 +5974,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5911,5 +5980,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5917,5 +5986,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5924,5 +5993,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5930,5 +5999,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5936,5 +6005,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5942,24 +6011,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Suodatus päällä</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> kohdetta piilossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> kohdetta himmeänä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5978,8 +6047,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:265
 msgid "Object with history"
-msgstr ""
+msgstr "Kohde historialla"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6004,37 +6073,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Syötä uuden pisteen koordinaatit."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Anna asteet desimaalilukuna."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Syötä leveyspiiri väliltä -90–90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Syötä pituuspiiri väliltä -180–180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Sulje ikkuna ja luo uusi piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Sulje ikkuna luomatta uutta pistettä"
@@ -6090,9 +6159,9 @@
 msgstr "Tietoja tasosta"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relaatiot"
@@ -6140,10 +6209,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Lataa valittujen relaatioiden epätäydelliset jäsenet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6163,37 +6232,37 @@
 msgstr "Avaa valintaikkuna."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
+msgstr "Etsi kohteita"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Sovita näkymä valittuihin kohteisiin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Valitse relaatioluettelosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Valitse relaatio relaatioluettelosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6202,27 +6271,27 @@
 msgstr "Valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+msgstr "Hae tarkat tiedot kohteiden sisäisestä tilasta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6231,5 +6300,5 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -6508,13 +6577,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Muutoskokoelman sisältöä ei ole vielä ladattu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Lataa nyt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Lataa muutoskokoelman sisältö"
@@ -6626,4 +6695,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6642,6 +6715,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6659,8 +6730,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6671,4 +6749,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6683,33 +6767,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6733,12 +6806,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6810,10 +6893,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6843,8 +6930,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6907,6 +6990,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6959,4 +7040,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7021,32 +7114,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7055,6 +7156,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7063,24 +7166,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7095,82 +7188,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7251,155 +7344,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nimi"
@@ -7824,4 +7922,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<eri>"
@@ -8354,17 +8453,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "myös emorelaatioiden välittömät lapsirelaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Lataa emorelaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Ladataan emorelaatioita"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Muokkaa valittua relaatiota"
@@ -8642,4 +8741,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8647,15 +8747,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Tyyppi"
@@ -8674,16 +8774,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "tuntematon"
@@ -9276,5 +9376,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9503,20 +9603,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Taso"
@@ -9983,5 +10083,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Nimi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Kuvaus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} jälki"
+msgstr[1] "{0} jälkeä"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Kuvaus"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Pituus: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} reitti, "
+msgstr[1] "{0} reittiä, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} reittipiste"
+msgstr[1] "{0} reittipistettä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9989,62 +10147,17 @@
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Nimi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Kuvaus: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} jälki"
 msgstr[1] "{0} jälkeä"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Kuvaus"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Pituus: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} reitti, "
-msgstr[1] "{0} reittiä, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} reittipiste"
-msgstr[1] "{0} reittipistettä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10054,10 +10167,10 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10068,7 +10181,7 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10076,10 +10189,10 @@
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10087,10 +10200,10 @@
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10098,21 +10211,21 @@
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10122,9 +10235,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10132,5 +10245,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10138,30 +10251,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10169,5 +10282,5 @@
 msgstr "Muokkaa väriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10176,5 +10289,5 @@
 msgstr "Oletusarvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10183,18 +10296,18 @@
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10204,23 +10317,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10660,15 +10773,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Ei kuvaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Ladataan {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -10781,5 +10894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
 msgid "Toggle visible state of the marker text and icons."
-msgstr ""
+msgstr "Näytä/piilota merkintöjen tekstit ja kuvakkeet"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
@@ -11605,4 +11718,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Oletusarvo on \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Lisää tallennettaessa varmuuskopiotiedostojen loppuun ~-merkki"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11685,5 +11841,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Auto"
@@ -11702,16 +11858,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Polkupyörä"
@@ -11745,12 +11901,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -12004,18 +12160,18 @@
 msgstr "Oletusarvo (automaattisesti päätetty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Käytä sisäänrakennettuja oletusarvoja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12332,26 +12488,18 @@
 msgstr "Projektiota {0} ei voitu aktivoida. Käytetään Mercatoria"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12467,6 +12615,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "tyyppiä natural {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12682,12 +12839,4 @@
 "authentication method ''Basic Authentication''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Säilytä varmuuskopiotiedostot"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Lisää tallennettaessa varmuuskopiotiedostojen loppuun ~-merkki"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
@@ -12876,5 +13025,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12883,49 +13032,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12935,15 +13084,15 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12953,17 +13102,17 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13097,5 +13246,5 @@
 "and ''display_name''"
 msgstr ""
-"Muutosjoukkoa ei voida hakea kyselyllä, jossa on sekä ”uid”- että "
+"Muutoskokoelmaa ei voida hakea kyselyllä, jossa on sekä ”uid”- että "
 "”display_name”-parametri"
 
@@ -13103,5 +13252,5 @@
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr "Muutosjoukkoa on haettu tuntemattomalla parametrilla ”{0}”"
+msgstr "Muutoskokoelmaa on haettu tuntemattomalla parametrilla ”{0}”"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
@@ -13578,5 +13727,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13676,5 +13825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13683,5 +13832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13750,5 +13899,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13758,10 +13907,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13769,5 +13918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13775,5 +13924,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13781,10 +13930,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13792,5 +13941,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13799,5 +13948,5 @@
 "Relaation {0} jäsenen \"ref\"-attribuutille saatiin virheellinen arvo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13805,5 +13954,5 @@
 msgstr "Relaation {1} jäseneltä {0} puuttuu \"type\"-attribuutti."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13814,10 +13963,10 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13825,9 +13974,9 @@
 msgstr "Poistetulla relaatiolla {0} on jäseniä"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13835,11 +13984,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13852,8 +14001,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13867,5 +14016,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13873,5 +14022,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13880,6 +14029,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13891,6 +14040,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13899,5 +14048,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13905,5 +14054,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13911,12 +14060,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13924,5 +14073,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13932,5 +14081,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13942,5 +14091,5 @@
 "jonka ulkoinen tunniste on \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13948,17 +14097,17 @@
 msgstr "Poistettuun jäseneen {0} viitataan relaatiosta {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14462,11 +14611,11 @@
 msgstr "Ladataan listaa liitännäisistä..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14475,16 +14624,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14493,5 +14642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14512,13 +14661,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Ilmoita ohjelmavirheestä"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14529,9 +14678,9 @@
 "käytät JOSMin uusinta<br>versiota, pyydämme sinua raportoimaan virheestä."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Odottamaton poikkeus"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14541,5 +14690,5 @@
 "lähettämistä, että käytät JOSMin uusinta versiota sivulta:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14549,5 +14698,5 @@
 "lähetä raportti virheenseurantaamme osoitteessa:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14559,5 +14708,5 @@
 "mahdollisimman yksityiskohtaisesti."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14567,9 +14716,9 @@
 "seuraavassa osoitteessa:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Teksti on jo kopioitu leikepöydälle)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "JOSMissa on tapahtunut virhe"
@@ -14766,5 +14915,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14817,5 +14966,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14828,5 +14977,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14836,5 +14985,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14845,5 +14994,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Vihje: Voit muokata pikanäppäimiä asetuksista.)"
@@ -14944,5 +15093,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -15028,10 +15177,62 @@
 msgstr "Lähettää jäljet openstreetmap.org:iin"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Aukioloajat"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Muuta ominaisuuksia"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Valitse"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Polku {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Työkalu: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Virhe suodattimessa"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "avoin"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -15203,51 +15404,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Maailman ulkopuolelle ei voi lisätä pistettä."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parametr ''{0}'' ei saa olla \"null\""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parametr ''{0}'' ei saa olla \"null\""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15346,16 +15549,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15369,5 +15564,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15480,5 +15675,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Rakennukset"
@@ -15715,5 +15910,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16128,8 +16323,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16243,6 +16434,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Tyhjä taso"
@@ -17610,5 +17801,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
@@ -17652,48 +17843,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "lataa data API:sta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "lataa data API:sta"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "vaihda valinta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "vaihda näkymä"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "varmista kaikki etähallinnan toimenpiteet käsin"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Etähallinta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Asetukset etähallintaliitännäiselle."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17704,34 +17900,34 @@
 "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Sallitut toiminnot"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Sallitaanko tämä?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Varmista etähallinnan toimenpide"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Pyynnös tiedot: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17954,58 +18150,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -18289,11 +18485,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Muokkaa putken ominaisuuksia"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19376,5 +19571,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19496,59 +19691,59 @@
 msgstr "Päällekkäiset polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20041,143 +20236,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "ylös"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Syötä ruutuindeksi"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Tikkaat"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20197,7 +20389,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "reitti"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20291,12 +20482,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Valitse haun tulokset"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "WayPoint-kuva"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20313,9 +20502,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20374,21 +20563,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20399,5 +20588,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20406,5 +20595,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20412,10 +20601,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20424,24 +20613,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20452,17 +20641,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20471,58 +20660,82 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston."
@@ -20591,8 +20804,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21084,16 +21296,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21101,5 +21318,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21107,5 +21324,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21114,5 +21331,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21121,10 +21338,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21132,15 +21349,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21150,5 +21367,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21157,10 +21374,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21169,5 +21386,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21176,15 +21393,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21194,15 +21411,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21211,5 +21428,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21218,5 +21435,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21225,10 +21442,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21237,5 +21454,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21245,5 +21462,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21252,20 +21469,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21274,5 +21491,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21314,4 +21531,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21344,10 +21562,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Väylät"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Tiet"
@@ -21358,5 +21576,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Moottoritie"
@@ -21365,5 +21583,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Muokkaa moottoritien ominaisuuksia"
@@ -21400,10 +21618,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Numero"
@@ -21417,8 +21635,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Kaistat"
@@ -21437,13 +21655,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -21477,17 +21695,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -21524,17 +21742,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21568,17 +21786,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -21609,17 +21827,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -21650,17 +21868,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Penger"
@@ -21668,5 +21886,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Moottoritien ramppi"
@@ -21675,5 +21893,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -21681,5 +21899,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Valtatie/moottoriliikennetie (trunk)"
@@ -21688,5 +21906,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Muokkaa valtatien ominaisuuksia"
@@ -21696,6 +21914,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21703,5 +21921,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Valtatien/moottoriliikennetien ramppi (trunk_link)"
@@ -21710,5 +21928,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -21721,5 +21939,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Kantatie (primary)"
@@ -21728,5 +21946,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Muokkaa kantatien ominaisuuksia"
@@ -21734,10 +21952,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Kantatien ramppi (primary_link)"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -21749,5 +21967,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Seututie (secondary)"
@@ -21757,5 +21975,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Muokkaa seututien ominaisuuksia"
@@ -21763,5 +21981,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Yhdystie/paikallistie"
@@ -21771,5 +21989,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Muokkaa yhdystien/paikallistien ominaisuuksia"
@@ -21781,5 +21999,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Tie (ei asuinkatu)"
@@ -21789,5 +22007,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Muokkaa tien ominaisuuksia"
@@ -21797,6 +22015,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21819,15 +22037,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21839,5 +22057,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Asuinkatu"
@@ -21846,5 +22064,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Muokkaa asuinkadun ominaisuuksia"
@@ -21864,12 +22082,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Pinta"
@@ -21891,166 +22109,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "päällystetty"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "päällystämätön"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "metsä"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "mukulakivi"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "sora"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "ruoho"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "hiekka"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "maa"
@@ -22058,5 +22276,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Pihakatu"
@@ -22065,5 +22283,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Muokkaa pihakadun ominaisuuksia"
@@ -22071,5 +22289,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Kävelykatu"
@@ -22078,5 +22296,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Muokkaa kävelykadun ominaisuuksia"
@@ -22084,5 +22302,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr ""
@@ -22091,5 +22309,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr ""
@@ -22099,18 +22317,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -22118,5 +22336,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Pysäköintialueen ajoväylä"
@@ -22126,10 +22344,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Muokkaa pysäköintialueen ajoväylän ominaisuuksia"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -22138,5 +22356,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -22144,14 +22362,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Rakennettava tie"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Muokkaa rakennettavan tien ominaisuuksia"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Liittymä"
@@ -22167,5 +22385,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -22174,5 +22392,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
@@ -22181,15 +22399,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -22197,5 +22415,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Pääsy (access)"
@@ -22221,4 +22439,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22226,4 +22445,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22299,236 +22524,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "yksityinen"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "ei"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "yksityinen"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "ei"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -22543,10 +22775,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Hevonen"
@@ -22562,10 +22794,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -22580,19 +22813,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -22600,20 +22833,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22621,5 +22854,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -22630,5 +22863,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -22648,10 +22881,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -22673,10 +22906,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -22698,10 +22931,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -22723,5 +22956,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22736,9 +22969,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "tie"
@@ -22752,9 +22985,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "pihakatu"
@@ -22798,10 +23031,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22831,5 +23064,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22841,10 +23074,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr ""
@@ -22852,10 +23085,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -22864,35 +23097,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Muokkaa metsätien ominaisuuksia"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22900,5 +23133,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Polku"
@@ -22907,76 +23140,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Moottorikelkka"
@@ -22985,5 +23218,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22991,5 +23224,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Muokkaa ratsastustien ominaisuuksia"
@@ -22997,5 +23230,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -23013,11 +23246,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -23025,5 +23258,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -23031,5 +23264,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -23037,5 +23270,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -23044,5 +23277,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
@@ -23050,5 +23283,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Portaat"
@@ -23058,10 +23291,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -23069,15 +23307,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr ""
@@ -23085,5 +23323,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -23091,10 +23329,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23123,36 +23362,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operaattori"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Palauta"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Muokkaa ravintolan ominaisuuksia"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Hätäpuhelin"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -23162,5 +23422,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -23169,27 +23429,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -23197,6 +23457,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -23205,11 +23465,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -23217,30 +23477,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr ""
@@ -23248,67 +23508,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr ""
@@ -23319,14 +23517,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -23336,5 +23596,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr ""
@@ -23342,15 +23602,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
@@ -23359,11 +23619,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Hätäpuhelin"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -23371,5 +23626,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -23377,5 +23632,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23385,10 +23640,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr ""
@@ -23396,5 +23651,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr ""
@@ -23402,5 +23657,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -23409,10 +23664,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Korkeus"
@@ -23420,5 +23675,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Esteet"
@@ -23426,5 +23681,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23432,5 +23687,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23475,16 +23730,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23493,5 +23748,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23499,5 +23754,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23505,10 +23760,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23516,15 +23771,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr ""
@@ -23532,5 +23787,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr ""
@@ -23538,10 +23793,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr ""
@@ -23550,5 +23805,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -23559,22 +23814,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Aita"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Muuri"
@@ -23582,5 +23837,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -23589,5 +23844,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23598,10 +23853,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr ""
@@ -23609,5 +23864,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Portti"
@@ -23615,50 +23870,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Tikkaat"
@@ -23666,25 +23921,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Muokkaa tikkaita"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Pyöröportti"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Muokkaa pyöröporttia"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23692,25 +23947,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Lähde"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Muokkaa lähteen ominaisuuksia"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr ""
@@ -23718,10 +23962,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23729,10 +23973,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr ""
@@ -23740,10 +23984,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanava"
@@ -23751,10 +23995,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Joki"
@@ -23764,59 +24008,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Lähde"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Muokkaa lähteen ominaisuuksia"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Vesiputous"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Muokkaa vesiputouksen ominaisuuksia"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr ""
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Pato"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Tekojärvi"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Muokkaa tekojärven ominaisuuksia"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr ""
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Maa"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Tekojärvi"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Muokkaa tekojärven ominaisuuksia"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Rantaviiva"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Muokkaa rantaviivan ominaisuuksia"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -23825,10 +24123,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -23839,14 +24138,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "räme"
@@ -23860,35 +24159,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Muta"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Ranta"
@@ -23896,20 +24195,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Lahti"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Kallio"
@@ -23917,145 +24216,215 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Rantaviiva"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Muokkaa rantaviivan ominaisuuksia"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Lähde"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Lauttaterminaali"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Auto"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "polkupyörä"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Lauttareitti"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Telakka"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr ""
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Pato"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Venesatama"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Laituri"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Muokkaa laiturin ominaisuuksia"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Sulkuportti"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Vesiputous"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Muokkaa vesiputouksen ominaisuuksia"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Venesatama"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Laituri"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Muokkaa laiturin ominaisuuksia"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Lauttaterminaali"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24065,16 +24434,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Telakka"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Liikenne"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Rata"
@@ -24082,5 +24473,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr ""
@@ -24110,7 +24501,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24126,8 +24517,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24141,29 +24532,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "sivuraide"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24176,8 +24567,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24248,8 +24639,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24261,8 +24652,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Jännite"
@@ -24275,8 +24666,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -24289,23 +24680,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24313,50 +24704,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -24364,5 +24755,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -24371,10 +24762,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
@@ -24383,9 +24774,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -24394,5 +24785,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -24401,5 +24792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Risteys"
@@ -24409,5 +24800,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -24415,5 +24806,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -24422,5 +24813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24429,10 +24820,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -24440,10 +24831,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -24451,10 +24842,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -24462,10 +24853,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24473,10 +24864,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24485,5 +24877,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24491,5 +24883,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24498,5 +24890,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24504,5 +24896,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -24512,69 +24904,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "maa"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24591,34 +25005,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24626,37 +25041,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Aukioloajat"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24677,33 +25103,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24712,170 +25140,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "kauppa"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Lähikauppa"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kioski"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24883,4 +25333,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24892,6 +25343,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Pysäköinti"
@@ -24900,5 +25351,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -24909,25 +25360,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24936,54 +25389,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Maksu"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Muokkaa autokaupan ominaisuuksia"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "kyllä"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Muokkaa puun ominaisuuksia"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Sisältö"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Puhelinnumero"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -24992,10 +25589,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr ""
@@ -25003,28 +25599,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr ""
+
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Muokkaa pyörätelineen ominaisuuksia"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Paikkojen lukumäärä"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Moottoripyörä"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Muokkaa moottoritien ominaisuuksia"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Etsi:"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Tallenna"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "maa"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Esivalinnat"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Vaatteet"
 
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Paikkojen lukumäärä"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Pyöräkauppa"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25034,5 +25689,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25040,5 +25695,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -25046,5 +25701,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -25052,5 +25707,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -25058,5 +25713,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -25065,5 +25720,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -25071,5 +25726,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -25078,5 +25733,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -25088,5 +25743,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -25094,10 +25749,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -25106,10 +25761,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -25118,5 +25773,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -25125,5 +25780,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -25131,5 +25786,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -25139,13 +25794,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr ""
@@ -25153,19 +25807,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Penkki"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -25173,5 +25827,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taksi"
@@ -25179,5 +25833,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -25185,10 +25839,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Lentokenttä"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25196,5 +25850,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25202,10 +25856,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25214,5 +25868,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -25220,5 +25874,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -25226,5 +25880,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -25232,5 +25886,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -25238,5 +25892,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25244,5 +25898,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25252,5 +25906,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25260,5 +25914,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -25269,6 +25923,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Loisto"
@@ -25278,5 +25932,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25285,5 +25939,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -25291,5 +25945,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -25297,15 +25951,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Matkailu"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -25317,5 +25971,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -25324,5 +25978,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
@@ -25335,8 +25989,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Tähdet"
@@ -25360,34 +26014,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25401,168 +26055,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminaali"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Puhelinnumero"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motelli"
@@ -25570,20 +26129,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -25591,10 +26150,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Hostelli"
@@ -25602,30 +26161,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -25633,10 +26193,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -25647,5 +26207,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -25653,5 +26213,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -25659,5 +26219,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr ""
@@ -25665,79 +26227,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -25745,18 +26307,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25764,10 +26326,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kahvila"
@@ -25775,10 +26337,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr ""
@@ -25786,20 +26353,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25807,10 +26374,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -25818,25 +26385,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museo"
@@ -25844,9 +26411,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -25855,9 +26422,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Teemapuisto"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr ""
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Taideteos"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -25865,50 +26453,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Teemapuisto"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr ""
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Taideteos"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr ""
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr ""
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Piknik-paikka"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Muokkaa piknik-paikan ominaisuuksia"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25946,5 +26535,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25952,28 +26541,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25983,5 +26572,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25989,5 +26578,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr ""
@@ -25995,6 +26584,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -26002,5 +26591,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -26008,6 +26597,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr ""
@@ -26015,5 +26604,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -26021,46 +26610,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26069,5 +26658,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -26075,55 +26664,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr ""
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr ""
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Piknik-paikka"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Muokkaa piknik-paikan ominaisuuksia"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Linna"
@@ -26132,19 +26700,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -26153,9 +26721,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -26163,10 +26731,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -26174,5 +26742,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26180,15 +26748,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -26196,55 +26764,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -26252,35 +26820,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Liikunta"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Liikuntapaikka"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -26294,6 +26862,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -26709,6 +27277,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26743,240 +27311,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskusta"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26993,5 +27561,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27018,23 +27585,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tyyppi"
@@ -27051,5 +27626,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27076,211 +27650,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Moottoriurheilu"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Muokkaa moottoriurheilun ominaisuuksia"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr ""
@@ -27288,52 +27865,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Ammunta"
@@ -27341,204 +27918,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Moottoriurheilu"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Muokkaa moottoriurheilun ominaisuuksia"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Varoitus"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Muokkaa pysäköinnin ominaisuuksia"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Auto"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Muokkaa moottoriurheilun ominaisuuksia"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Muokkaa kuivapesulan ominaisuuksia"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Muokkaa golf-kentän ominaisuuksia"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Auto"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Muokkaa köysiradan ominaisuuksia"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Keinotekoiset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Rakennus"
@@ -27546,5 +28189,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -27552,10 +28195,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -27563,10 +28206,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -27574,10 +28217,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -27586,10 +28229,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Vankila"
@@ -27598,10 +28241,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Poliisiasema"
@@ -27611,10 +28254,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -27623,10 +28266,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -27634,5 +28277,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -27640,15 +28283,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Koulu"
@@ -27656,10 +28299,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Yliopisto"
@@ -27667,10 +28310,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Korkeakoulu"
@@ -27678,5 +28321,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -27684,5 +28327,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -27691,10 +28334,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Kirjasto"
@@ -27703,9 +28346,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -27713,10 +28356,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teatteri"
@@ -27725,10 +28368,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr ""
@@ -27738,5 +28381,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr ""
@@ -27745,6 +28388,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Uskonto"
@@ -27753,66 +28396,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr ""
@@ -27821,189 +28464,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Osoitteet"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Muokkaa osoitetietoja"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Talon numero"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Talon nimi"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Kadunnimi"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Kaupungin nimi"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Postinumero"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Maakoodi"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Muokkaa interpolointilinjaa"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "pariton"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "parillinen"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -28011,25 +28584,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -28037,10 +28610,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -28048,10 +28621,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Putki"
@@ -28060,41 +28633,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -28104,10 +28677,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Nosturi"
@@ -28115,5 +28688,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
@@ -28121,10 +28694,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr ""
@@ -28132,10 +28705,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -28143,23 +28716,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr ""
@@ -28169,35 +28742,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr ""
@@ -28206,10 +28779,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -28218,5 +28791,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -28224,10 +28797,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -28238,23 +28811,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -28263,20 +28836,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28284,55 +28857,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Puhelin"
@@ -28341,5 +28914,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -28347,5 +28920,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Kolikot"
@@ -28353,5 +28926,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr ""
@@ -28359,5 +28932,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -28365,5 +28938,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr ""
@@ -28371,15 +28944,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -28388,5 +28961,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -28394,35 +28967,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Peltitölkit"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Vaatteet"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28430,5 +28998,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28437,31 +29005,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28540,5 +29108,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28548,31 +29116,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -28580,31 +29148,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Lähde"
@@ -28613,10 +29181,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -28625,10 +29193,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28637,5 +29205,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28643,314 +29211,305 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Jalankulku (foot)"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr ""
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Lähikauppa"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Muokkaa lähikaupan tietoja"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kioski"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Muokkaa kioskin ominaisuuksia"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Lihakauppa"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Muokkaa lihakaupan ominaisuuksia"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Leipomo"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Muokkaa leipomon ominaisuuksia"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Luomukauppa"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Muokkaa luomukaupan ominaisuuksia"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr ""
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Muokkaa autokaupan ominaisuuksia"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Pyöräkauppa"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Lähikauppa"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Muokkaa lähikaupan tietoja"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kioski"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Muokkaa kioskin ominaisuuksia"
-
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Kampaamo"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Muokkaa kampaamon ominaisuuksia"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Muokkaa optikon ominaisuuksia"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Muokkaa urheiluvälinekauppaa"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Muokkaa urheiluvälinekauppaa"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Kuivapesula"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Muokkaa kuivapesulan ominaisuuksia"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Pesula"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Muokkaa pesulan ominaisuuksia"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Rata"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Muokkaa tornin ominaisuuksia"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Tee-se-itse-kauppa"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:3010
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:3011
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:3016
 msgid "Travel Agency"
 msgstr "Matkatoimisto"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:3017
 msgid "Edit Travel Agency"
 msgstr "Muokkaa matkatoimistoa"
 
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Lihakauppa"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Muokkaa lihakaupan ominaisuuksia"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Leipomo"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Muokkaa leipomon ominaisuuksia"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Luomukauppa"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Muokkaa luomukaupan ominaisuuksia"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Tee-se-itse-kauppa"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Kampaamo"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Muokkaa kampaamon ominaisuuksia"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Kuivapesula"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Muokkaa kuivapesulan ominaisuuksia"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Pesula"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Muokkaa pesulan ominaisuuksia"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Muokkaa urheiluvälinekauppaa"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Muokkaa optikon ominaisuuksia"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -28958,5 +29517,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -28964,97 +29523,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "julkisen liikenteen lippuja"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "julkisen liikenteen aikatauluja"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Pankki"
@@ -29062,14 +29621,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -29077,5 +29636,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -29083,15 +29642,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -29099,18 +29658,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -29118,5 +29677,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -29124,9 +29683,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Sairaala"
@@ -29134,10 +29693,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -29146,5 +29716,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -29153,15 +29723,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -29169,5 +29739,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -29176,368 +29746,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Maantiede"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Rajat"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Kansallinen"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Muokkaa kansallisen rajan ominaisuuksia"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Hallinnollinen"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Muokkaa poliittisen rajan ominaisuuksia"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr ""
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Paikat"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Maanosa"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Maa"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Osavaltio"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Seutu"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr ""
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr ""
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr ""
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Suurkaupunki"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Muokkaa suurkaupungin ominaisuuksia"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Kaupunki"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Kaupunginosa"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Kunta"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Kylä"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Huippu"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Muokkaa huipun ominaisuuksia"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Jäätikkö"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Muokkaa jäätikön ominaisuuksia"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Tulivuori"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Muokkaa tulivuoren ominaisuuksia"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Luolan suuaukko"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Muokkaa luolan suuaukon ominaisuuksia"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Saari"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Ei päivämäärää"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Puu"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Muokkaa puun ominaisuuksia"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Kasvitieteellinen nimi"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Metsä"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Muokkaa metsän ominaisuuksia"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "havumetsä"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "lehtimetsä"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "sekametsä"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Talousmetsä"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Muokkaa talousmetsän ominaisuuksia"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Luonnonsuojelualue"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr ""
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Luolan suuaukko"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Muokkaa luolan suuaukon ominaisuuksia"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Huippu"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Muokkaa huipun ominaisuuksia"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Jäätikkö"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Muokkaa jäätikön ominaisuuksia"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Tulivuori"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Muokkaa tulivuoren ominaisuuksia"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Rajat"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Kansallinen"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Muokkaa kansallisen rajan ominaisuuksia"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Hallinnollinen"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Muokkaa poliittisen rajan ominaisuuksia"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Kivikko, rakka"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Muokkaa kivikon ominaisuuksia"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Tunturi"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Muokkaa tunturin ominaisuuksia"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Pusikko"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Muokkaa pusikon ominaisuuksia"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Nummi"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Muokkaa nummen ominaisuuksia"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Puu"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Muokkaa puun ominaisuuksia"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Kasvitieteellinen nimi"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Metsä"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Muokkaa metsän ominaisuuksia"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "havumetsä"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "lehtimetsä"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "sekametsä"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Talousmetsä"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Muokkaa talousmetsän ominaisuuksia"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Luonnonsuojelualue"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr ""
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Kivikko, rakka"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Muokkaa kivikon ominaisuuksia"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Pusikko"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Muokkaa pusikon ominaisuuksia"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Tunturi"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Muokkaa tunturin ominaisuuksia"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Nummi"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Muokkaa nummen ominaisuuksia"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -29546,45 +30122,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -29592,25 +30168,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29618,10 +30194,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29629,20 +30205,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr ""
@@ -29650,5 +30226,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29656,15 +30232,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -29672,9 +30248,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -29682,39 +30258,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -29722,15 +30298,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -29738,52 +30314,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Nähtävyys"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Osoitteet"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Muokkaa osoitetietoja"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Talon numero"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Talon nimi"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Kadunnimi"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Kaupungin nimi"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Postinumero"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Maakoodi"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "P"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "I"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "K"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "E"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Muokkaa interpolointilinjaa"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "pariton"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "parillinen"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Sisältö"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Lisää tekijän tiedot"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Kuva"
 
 #. item "Relations/Multipolygon"
@@ -29791,5 +30500,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29801,5 +30510,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29807,5 +30516,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29813,5 +30522,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29822,5 +30531,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29828,36 +30537,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29865,5 +30574,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -29872,5 +30581,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29878,34 +30587,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr ""
@@ -29914,15 +30623,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr ""
@@ -29930,5 +30639,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29937,5 +30646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29943,132 +30652,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "polkupyörä"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -30136,5 +30734,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30144,9 +30742,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -30160,10 +30758,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -30171,31 +30769,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -30204,30 +30802,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34205,7 +34803,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34327,8 +34924,11 @@
 msgstr "Sicily - Italy"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Säilytä varmuuskopiotiedostot"
 
 #~ msgid "Unknown version"
@@ -34363,7 +34963,4 @@
 #~ msgstr[0] "kuva"
 #~ msgstr[1] "kuvat"
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
 
 #~ msgid "Proxy server host"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 22859)
+++ applications/editors/josm/i18n/po/fr.po	(revision 22863)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-19 21:23+0000\n"
-"Last-Translator: Baptiste Darthenay <e5p3r0-rosetta@yahoo.fr>\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-28 16:09+0000\n"
+"Last-Translator: Frédéric Bonifas <fredericbonifas@gmail.com>\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-08-20 19:14+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -74,5 +74,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -93,5 +93,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Avertissement"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Éditeur Java OpenStreetMap"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -411,4 +411,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -426,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1054,5 +1055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1061,5 +1062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1072,5 +1073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1485,13 +1486,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "Purger"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr "Confirmer la purge"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1502,5 +1503,5 @@
 "mais <i>pas</i><br>du serveur durant l'envoi."
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1510,9 +1511,9 @@
 "sélectionnés :"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Ajouter à la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1522,5 +1523,5 @@
 "ignorés.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Effacer le cache des annulations"
@@ -1554,8 +1555,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1564,9 +1565,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1582,6 +1583,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1591,5 +1592,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1614,6 +1615,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Erreur"
@@ -1776,5 +1777,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Non, annuler"
@@ -2064,5 +2065,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2554,5 +2555,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2596,5 +2597,5 @@
 "Confirmez-vous ce déplacement massif ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2602,5 +2603,5 @@
 "rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2609,9 +2610,9 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2901,5 +2902,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Rechercher"
@@ -3113,7 +3114,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3388,5 +3389,5 @@
 msgstr[1] "Déplacer {0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3544,6 +3545,6 @@
 msgstr "Correction automatique d’attribut"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
@@ -3551,5 +3552,5 @@
 "Incapable de créer le dossier {0}, la sauvgarde automatique sera désactivée"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
@@ -3557,5 +3558,5 @@
 "Incapable de créer le fichier {0}, un autre nom de fichier va être utilisé"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
@@ -3564,15 +3565,15 @@
 "ignorée : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+msgstr "Impossible de supprimer le vieux fichier de sauvegarde {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "Erreur pendant la création de la sauvegarde du calque supprimé : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3592,15 +3593,15 @@
 msgstr "Valeur de longitude ''{0}'' erronée"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Attention : impossible de forcer les préférences pour ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Erreur dans le fichier de configuration aux lignes {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3611,5 +3612,5 @@
 "préférences ''{0}'' n’est pas un dossier."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3620,5 +3621,5 @@
 "préférences ''{0}'' n’est pas un dossier.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3629,5 +3630,5 @@
 "le dossier manquant des préférences : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3638,5 +3639,5 @@
 "manquant des préférences : {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3646,5 +3647,5 @@
 "fichier de préférences par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3655,5 +3656,5 @@
 "par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3664,5 +3665,5 @@
 "le fichier des préférences par défaut : {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3674,5 +3675,5 @@
 "préférences par défaut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3683,5 +3684,5 @@
 "rétablir le fichier des préférences par défaut : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
@@ -3689,5 +3690,5 @@
 "Erreur : Ligne ''{0}'' inattendue dans le fichier des marque-pages ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3820,5 +3821,5 @@
 "inclue"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3876,4 +3877,6 @@
 msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
+"Conflit concernant l'attribut 'visible' appartenant à l'objet de type {0} "
+"ayant pour id {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3897,9 +3900,9 @@
 "est {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3909,5 +3912,5 @@
 "l'autre ne l'est pas"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4106,15 +4109,34 @@
 msgstr "PUWG 2000 Zone {0} (Pologne)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grille Suisse"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Zone UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Nord"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Sud"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Aller ici"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4138,9 +4160,9 @@
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM France (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "Système UTM Geodesic"
@@ -4185,5 +4207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "voie ferrée"
@@ -4204,5 +4226,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4461,29 +4483,29 @@
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Télécharger la zone délimitée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharger le lieu se rapportant à l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4491,9 +4513,9 @@
 "Fichier/Ouvrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone délimitée en données GPS brutes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4501,34 +4523,34 @@
 "lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Définissez la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 "options disponibles en tant que fichiers de propriétés système pour Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Changer le répertoire pour tous les paramètres utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4541,9 +4563,9 @@
 "     pour spécifier la taille maximale de mémoire allouée en mégaoctets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4553,59 +4575,69 @@
 "cet ordre."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Assurez-vous de charger des données si vous utilisez --sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initialisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Mise à jour des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Installation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Création de l’interface graphique"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Données OSM non sauvegardées"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Restaurer"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "Cartes de débit"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM a trouvé {0} calques de données OSM non sauvegardées. Il semblerait que "
 "JOSM a planté la dernière fois. Souhaitez-vous restaurer les données ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "L’option {0} a été supprimée car elle n’est plus utilisée."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4619,9 +4651,9 @@
 "d'information :"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "Quitter JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Continuer, essayer quand même"
@@ -4635,9 +4667,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4761,23 +4794,23 @@
 msgstr "Utilisateur :"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Le calque \"{0}\" doit se trouver dans la liste des calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Métrique"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Impérial"
@@ -4876,5 +4909,5 @@
 msgstr "Annuler la suppression des objets et fermer la fenêtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4884,17 +4917,17 @@
 "niveau de zoom.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Niveau de zoom :"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "de la tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "à la tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4907,25 +4940,25 @@
 "<i>zoom,x,y</i> et <i>zoom;x;y</i> sont aussi valides.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Adresse :"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Valider l’adresse"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Veuillez entrer l’adresse d'une tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "La valeur indiquée n'est pas l’adresse valide d’une tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Veuillez entrer l’index d’une tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5353,4 +5386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5436,4 +5470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5450,4 +5485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5523,5 +5559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5533,10 +5569,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "rien"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "all"
@@ -5619,5 +5655,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5629,5 +5665,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5664,17 +5700,17 @@
 msgstr "Pas encore décidé."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Rôle :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Entrez un rôle pour tous les membres de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Le tag modifie les relations avec "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5684,16 +5720,16 @@
 "relations modifiées.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Attribut"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Entrer un nom d’attribut, c.à.d. <strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
 #: ../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>Entrer un nom d’attribut, c.à.d. <strong><tt>fixme</tt></strong></html>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5701,5 +5737,5 @@
 msgstr "Valeur :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5708,5 +5744,5 @@
 "tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5724,5 +5760,5 @@
 "la place du chemin initial de la relation.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5740,5 +5776,5 @@
 "nœud initial de la relation.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Appliquer ce rôle à tout les membres."
@@ -5891,5 +5927,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -6008,5 +6044,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -6014,5 +6050,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -6020,5 +6056,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -6026,5 +6062,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -6032,5 +6068,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -6039,5 +6075,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6045,5 +6081,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6051,5 +6087,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6057,24 +6093,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtre actif</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objets cachés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objets désactivés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6097,5 +6133,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6120,37 +6156,37 @@
 msgstr "Information avancées de l'objet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Veuillez entrer les coordonnées du nouveau nœud."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Utiliser les degrés décimaux"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Les valeurs négatives indiquent la partie Ouest/Sud de l’hémisphère."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Veuillez entrer une latitude valide entre -90° et 90°"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Veuillez entrer une latitude entre -90° et 90°"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Veuillez entrer une longitude valide entre -180° et 180°"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Veuillez entrer une longitude entre -180° et 180°"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Fermer la fenêtre et créer un nouveau nœud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Fermer la fenêtre sans créer de nouveau nœud"
@@ -6206,9 +6242,9 @@
 msgstr "Informations à propos du calque."
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relations"
@@ -6256,10 +6292,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Télécharger les membres incomplets des relations sélectionnées"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Télécharger les membres incomplets"
@@ -6279,37 +6315,37 @@
 msgstr "Ouvrir la liste de sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Rechercher les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoomer sur la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 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:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Lancer l'éditeur pour la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Lancer l'éditeur de relation pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Sélectionner dans la liste des relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Sélectionnez une relation dans la liste des relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6318,32 +6354,32 @@
 msgstr "Sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sélection : Relations : {0} / Chemins : {1} / Nœuds : {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Sélection : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Obtenir les informations détaillées sur l'état interne des objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Inspecter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Détacher le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Fermer le panneau (vous pouvez le rouvrir depuis la barre d’outils)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Réduire/Agrandir le panneau"
@@ -6637,13 +6673,13 @@
 msgstr "Rien sur quoi zoomer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Le contenu de ce groupe de modifications n’est pas encore téléchargé."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Télécharger maintenant"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Télécharger le contenu du groupe de modifications"
@@ -6755,4 +6791,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6771,6 +6811,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6788,8 +6826,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6800,4 +6845,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6812,33 +6863,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6862,12 +6902,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6939,10 +6989,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6972,8 +7026,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -7036,6 +7086,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7088,4 +7136,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7150,32 +7210,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7184,6 +7252,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7192,24 +7262,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7224,82 +7284,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7380,155 +7440,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nom"
@@ -8006,4 +8071,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<différent>"
@@ -8255,5 +8321,5 @@
 "''{0}''.</html>"
 msgstr ""
-"<html>Vous essayer d’ajouter une relation à elle-même.<br>Cela créait des "
+"<html>Vous essayez d’ajouter une relation à elle-même.<br>Cela crée des "
 "références circulaires et n’est pas recommandé.<br>Abandon de la relation "
 "''{0}''.</html>"
@@ -8540,17 +8606,17 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "inclure les enfants des relations parentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Charger les relations parentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Chargement des relations parentes."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Modifier la relation sélectionnée"
@@ -8844,4 +8910,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8849,15 +8916,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Type"
@@ -8876,16 +8943,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "inconnue"
@@ -9529,5 +9596,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Ouvrir un répertoire"
@@ -9791,20 +9858,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Calque"
@@ -10317,5 +10384,63 @@
 msgstr[1] "{0} objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Nom : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Description : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} trace"
+msgstr[1] "{0} traces"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Durée"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Longueur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Longueur : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} itinéraire, "
+msgstr[1] "{0} itinéraires, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} point"
+msgstr[1] "{0} points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10323,62 +10448,17 @@
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Nom : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Description : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} trace"
 msgstr[1] "{0} traces"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Description"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Durée"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Longueur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Longueur : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} itinéraire, "
-msgstr[1] "{0} itinéraires, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} point"
-msgstr[1] "{0} points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10388,10 +10468,10 @@
 "comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10402,7 +10482,7 @@
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10410,10 +10490,10 @@
 msgstr "Télécharger depuis OSM le long de ce chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10421,10 +10501,10 @@
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10432,21 +10512,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Télécharger à proximité de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "chemin uniquement"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "points de passage uniquement"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "chemin et points de passage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10458,5 +10538,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -10464,5 +10544,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10472,5 +10552,5 @@
 "fin de la trace ont été ignorés ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10480,30 +10560,30 @@
 "leur horodatage ont été ignorés."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10511,5 +10591,5 @@
 msgstr "Personnaliser la couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10518,5 +10598,5 @@
 msgstr "Par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10525,18 +10605,18 @@
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de parcours nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importer Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10549,23 +10629,23 @@
 "points ne sont pas horodatés.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import impossible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -11027,15 +11107,15 @@
 msgstr "Le fichier de l'image n'a pas pu être supprimé."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Aucune image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Chargement {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -12104,4 +12184,49 @@
 msgstr "Étalonnage de l’enregistrement de la voix"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Intervalle de mise à jour (jours) :"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "La valeur par défaut est \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Lors de la sauvegarde, garder les fichiers de sauvegarde se terminant par ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Fichier de sauvegarde"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Configurer pour créer des fichiers de sauvegarde"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -12185,5 +12310,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Voiture"
@@ -12202,16 +12327,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Vélo"
@@ -12245,12 +12370,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Piéton"
@@ -12423,9 +12548,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr ""
+msgstr "Autorise le changement du nommage des points du trajet."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr ""
+msgstr "Nommage des points"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
@@ -12515,18 +12640,18 @@
 msgstr "Par défaut (déterminée automatiquement)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Activer les valeurs par défauts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Activer les icônes par défauts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Modèle utilisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Coloriage de la carte"
@@ -12858,5 +12983,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
 msgid "System of measurement"
-msgstr ""
+msgstr "Système de mesure"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12869,28 +12994,20 @@
 msgstr "La projection {0} ne peut être activée. Utilisation de Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Identification"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Configuration du proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Fichier de sauvegarde"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 "Configurez votre identité et la manière de vous authentifier au serveur OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Configurer si vous souhaitez utiliser un serveur proxy"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Configurer pour créer des fichiers de sauvegarde"
 
 #. 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
@@ -13007,6 +13124,15 @@
 "depuis<br>''{0}''.<br>Détails (non traduits) :<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "Outils externes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13054,4 +13180,7 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
+"<html>Les attributs du modèle source {0} peuvent être chargés mais "
+"contiennent des erreurs. Voulez-vous vraiment l'utiliser ?<br><br><table "
+"width=600>L'erreur est : {1}</table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
@@ -13251,13 +13380,4 @@
 "actuellement  ''{1}''. Utilisation de la méthode d’identification simple."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Garder les fichiers de sauvegarde"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Lors de la sauvegarde, garder les fichiers de sauvegarde se terminant par ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13456,5 +13576,5 @@
 msgstr "Ajouter un nouvel attribut"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13465,49 +13585,49 @@
 "display_values doit être le même que dans les valeurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Plus d’infos sur cette caractéristique"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Prérequis inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Rôles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "éléments"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels :"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "Élément de rôle prédéfini sans parent"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "Sous élément prédéfini sans parent"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13517,15 +13637,15 @@
 msgstr "Impossible de lire la source des balises : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur d’analyse de {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont supportés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13535,17 +13655,17 @@
 msgstr[1] "Modifier {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Rien n’est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Appliquer le pré-réglage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13576,5 +13696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
 msgid "Show only applicable to selection"
-msgstr ""
+msgstr "Montrer que ce qui est applicable à la sélection"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
@@ -14214,5 +14334,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14331,5 +14451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14338,5 +14458,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14414,5 +14534,5 @@
 msgstr "Le fichier \"{0}\" n’existe pas"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14425,10 +14545,10 @@
 "''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "L’élément XML <nd> trouvé n’est pas un enfant de l’élément <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14436,5 +14556,5 @@
 msgstr "Attribut obligatoire \"{0}\" manquant pour le chemin {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14444,5 +14564,5 @@
 "elle est {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14450,5 +14570,5 @@
 msgstr "Le chemin supprimé {0} possède des nœuds"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -14456,5 +14576,5 @@
 "L’élément XML <member> trouvé n’est pas un enfant de l’élément <relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14462,5 +14582,5 @@
 msgstr "Attribut ''ref'' manquant pour le membre dans la relation {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14470,5 +14590,5 @@
 "erronée. Actuellement elle est {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14476,5 +14596,5 @@
 msgstr "Attribut \"type\" manquant pour le membre {0} de la relation {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14485,10 +14605,10 @@
 "erronée. Actuellement elle est {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Champ <member> incomplet avec ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14496,9 +14616,9 @@
 msgstr "La relation supprimée {0} contient des membres"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "Clé manquante ou attribut de valeur dans étiquette manquant."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14507,11 +14627,11 @@
 "L’élément ''{0}'' trouvé dans le flux d’entré n’est pas défini. Abandon."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "L’objet avec l’identifiant 0 est erroné"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14525,8 +14645,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14543,5 +14663,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14551,5 +14671,5 @@
 "est {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14559,6 +14679,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14572,6 +14692,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14582,5 +14702,5 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14588,5 +14708,5 @@
 msgstr "Attribut requis \"{0}\" manquant."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14596,5 +14716,5 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
@@ -14605,5 +14725,5 @@
 "l’identifiant ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14611,5 +14731,5 @@
 msgstr "Le noeud supprimé {0} fait partie du chemin {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14621,5 +14741,5 @@
 "était manquant dans les données chargées."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14631,5 +14751,5 @@
 "avec l’identifiant ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14637,17 +14757,17 @@
 msgstr "Le membre supprimé {0} est utilisé par la relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Préparation des données OSM…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Récupération des données d’OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Préparation des données..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15120,5 +15240,5 @@
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
-"Essayer de mettre à jour le greffon vers une version plus récente avant de "
+"Essayez de mettre à jour le greffon vers une version plus récente avant de "
 "remplir un rapport d’erreur."
 
@@ -15206,11 +15326,11 @@
 msgstr "Téléchargement de la liste des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Téléchargement de la liste des greffons depuis ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15221,16 +15341,16 @@
 "Impossible de mettre en cache la liste des greffons depuis le site ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Écriture de la liste des greffons dans le cache ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Analyse de la liste des greffons du site ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15241,5 +15361,5 @@
 "site. Exception : {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15260,13 +15380,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Signaler une erreur"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15278,9 +15398,9 @@
 "de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Exception inattendue"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -15290,5 +15410,5 @@
 "d’erreur, vérifiez que vous utilisez la dernière version de JOSM :"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -15298,5 +15418,5 @@
 "remplir un rapport d’erreur sur notre site :"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15307,5 +15427,5 @@
 "information détaillée sur la manière de reproduire l’erreur."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -15315,9 +15435,9 @@
 "cette URL :"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Ce texte a déjà été copié dans votre presse-papier.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Vous avez rencontré une erreur dans JOSM"
@@ -15531,5 +15651,5 @@
 msgstr ""
 "La zone que vous essayer de télécharger est trop grande ou votre requête "
-"était trop large.<br>Veuillez téléchargez une plus petite zone ou utiliser "
+"était trop large.<br>Veuillez télécharger une zone plus petite ou utiliser "
 "un fichier d’export fourni par la communauté OSM."
 
@@ -15577,5 +15697,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15639,5 +15759,5 @@
 msgstr "unutilisé"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15650,5 +15770,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15658,5 +15778,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15667,5 +15787,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -15787,5 +15907,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Visibilité"
@@ -15874,10 +15994,62 @@
 msgstr "Envoyer les traces vers openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Horaires d’ouverture"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Modifier les propriétés d’{0} objet"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Choisir"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Chemin {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Outil : {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Erreur dans le filtre"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "ouvrir"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -16059,58 +16231,59 @@
 msgstr "Aligner les chemins"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"Vous ne pouvez pas aligner deux segments qui sont connectés.\n"
-"S'il vous plait, choisissez  deux segments qui ne partagent aucun nœud."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "Message AlignWayS"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"Aligner générerait des nœuds situés hors des limites de la planète. Votre "
+"action est annulée."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Je sui prêt"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "Astuces pour les AlignWays"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Mode alignement des chemins"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Segment de chemin aligné"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Le paramètre ''{0}'' ne doit pas être nul."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"Le segment à aligner ne peut pas être le même que le segment de référence.\n"
+"Veuillez choisir un autre segment à aligner."
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"Aligner générerait des nœuds situés hors des limites de la planète. Votre "
-"action est annulée."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Je sui prêt"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "Astuces pour les AlignWays"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "Mode alignement des chemins"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "Segment de chemin aligné"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Le paramètre ''{0}'' ne doit pas être nul."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"Le segment à aligner ne peut pas être le même que le segment de référence.\n"
-"Veuillez choisir un autre segment à aligner."
+msgstr "Message AlignWayS"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -16252,15 +16425,12 @@
 "\n"
 msgstr ""
-
-#. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
-msgid ""
 "<html>\n"
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  <li>Éventuellement <b>changer le point pivot de la rotation</b>. Afin de "
+"rester parallèle au segment de référence, le segment à aligner va subir une "
+"rotation autour de ce point. Vous pouvez choisir les deux extrémités ou le "
+"centre du segment en <b><i><span style=\"color:green\">cliquant</span></i></"
+"b> à ce niveau. \n"
 "  </li>\n"
 "</ul>\n"
@@ -16268,7 +16438,15 @@
 "</html>\n"
 "\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -16281,6 +16459,14 @@
 "\n"
 msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Dernier conseil :</b> Il y a un moyen simple de recommencer vos "
+"sélections si vous voulez : <b><i><span style=\"color:green\">Alt-Clic</"
+"span></i></b> quelque part sur la carte.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "Ne plus voir ce message"
@@ -16316,5 +16502,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
-msgstr ""
+msgstr "Faire pivoter en forme de croix"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
@@ -16393,5 +16579,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Bâtiments"
@@ -16584,5 +16770,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Utiliser \"Tableau d''assemblage\""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16648,5 +16834,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16904,4 +17090,6 @@
 "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
+"Ajouter le(s) \"Tableau(x) d'assemblage\" dans la liste des feuilles de "
+"cadastre à utiliser."
 
 #. the crosspiece display
@@ -17096,8 +17284,4 @@
 msgstr "Est"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Nord"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -17221,6 +17405,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Calque vide"
@@ -17349,22 +17533,22 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
 msgid "Download along..."
-msgstr ""
+msgstr "Télécharger en longueur..."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
 msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "Télécharger les donnée OSM le long des chemins sélectionnés."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
 msgid "Download Along"
-msgstr ""
+msgstr "Télécharger le long"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
 msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "Veuillez sélectionner un ou plusieurs chemins pour télécharger le long"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} nodes intermédiaires à télécharger"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
@@ -18610,9 +18794,9 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
 msgid "Create Stops from GTFS ..."
-msgstr ""
+msgstr "Créer des Arrêts à partir de GTFS ..."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
 msgid "Create Stops from a GTFS file"
-msgstr ""
+msgstr "Créer des Arrêts à partir d'un fichier GTFS"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
@@ -18624,9 +18808,9 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
 msgid "GTFS-Stops"
-msgstr ""
+msgstr "Arrêts-GTFS"
 
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Transport public"
@@ -18670,48 +18854,53 @@
 msgstr "Traces"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Points"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "chargement des données depuis l’API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "Données importées depuis {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "créer de nouveaux objets"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "Changer la sélection"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "changer le viewport"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgstr "version du protocole de lecture"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "Confirmez toutes les actions de Remote Control manuellement"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Permet un contrôle de JOSM par d’autres applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Paramètres du greffon Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18723,21 +18912,21 @@
 "communiquant avec le greffon."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Actions permises"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Voulez-vous permettre cela ?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Confirmer l’action de Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Il a été demandé à Remote Control de créer un nouveau nœud."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18745,14 +18934,14 @@
 "suivante :"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il a été demandé à Remote Control de charger les données depuis l’API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18976,58 +19165,58 @@
 msgstr "Supprime les nœuds inutiles d'une zone."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Carte glissante"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Zoom automatique"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Charger la tuile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Monter les informations sur la tuile."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Charger toutes les tuiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Augmenter le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Diminuer le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Revenir à la taille de la tuile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Réinitialiser la mémoire tampon des tuiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "chargement automatique des tuiles"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Paramètres du greffon SlippyMap."
@@ -19319,12 +19508,10 @@
 msgstr "Bâtiments mitoyens"
 
-# Le terme « éditer » pour edit n'est pas approprié. Le bon terme serait plutôt « modifier ».
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Modifier une canalisation"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -20499,5 +20686,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygone"
@@ -20623,59 +20810,59 @@
 msgstr "Chemins superposés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "Vérificateur de relation :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Ce greffon vérifie les erreurs dans les relations."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Le type de relation est inconnu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "La relation est vide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<vide>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "Le rôle {0} manque"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Problème de vérification de rôle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "Nombre de rôles {0} trop bas ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "Nombre de rôles {0} trop élevé ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "Membre du rôle {0} du mauvais type"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "Rôle {0} inconnu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "Rôle vide trouvé"
@@ -21167,144 +21354,140 @@
 msgstr "{0}…"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% des traces GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Affiche la position actuelle dans la vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Importer une vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Synchroniser une vidéo avec une trace GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Supprimer une vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "supprime la vidéo actuelle du calque"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "jouer/pause"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "démarre/pause la reproduction vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "recule"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr "recule de n secondes"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "petit dos d’âne"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Veuillez entrer l’index d’une tuile"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "avance"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr "avance de n secondes"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "plus rapide"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "reproduction plus rapide"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "plus lent"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "reproduction plus lente"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "en boucle"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr "reproduit en boucles les n secondes autour de la position actuelle"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Garder centré"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "suit l'icône de la vidéo automatiquement"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Échalier"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Affiche la position actuelle dans la vidéo"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Durée du saut"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Précise la durée du saut"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "Saute la reproduction de x ms"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Durée de la boucle"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Précise la durée de la boucle autour d'un point"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr "pas de des-entrelacement"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr "des-entrelacement en utilisant le doublement de ligne"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr "des-entrelacement en utilisant l'interpolation linéaire"
@@ -21324,7 +21507,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multiple"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21435,12 +21617,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Sélectionner avec la recherche actuelle"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Points"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -21457,9 +21637,9 @@
 msgstr "Sélectionner les séquences non-ramifiées de chemins"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Une exception est survenue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Pas en cache"
@@ -21509,5 +21689,5 @@
 "again."
 msgstr ""
-"Impossible faire correspondre le lien ou l’identifiant au service "
+"Impossible de faire correspondre le lien ou l’identifiant au service "
 "sélectionné. Veuillez réessayer."
 
@@ -21520,21 +21700,21 @@
 msgstr "Ajuster la position du calque WMS sélectionné"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Veuillez sélectionner le calque WMS à ajuster."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Sélectionnez le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Commencer à ajuster"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Il n’y a actuellement pas de calque WMS à ajuster."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Pas de calque à ajuster."
@@ -21545,5 +21725,5 @@
 msgstr "Télécharger la tuile WMS depuis {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21554,5 +21734,5 @@
 "« ? »."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21562,10 +21742,10 @@
 "vérifier vos préférences."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Attention : l’URL complète est ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21576,5 +21756,5 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21583,19 +21763,19 @@
 "« {0} »"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(désactivé)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21609,17 +21789,17 @@
 "vos<br>préférences.<br>Voulez-vous récupérer des tuiles WMS ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21627,33 +21807,33 @@
 "La zone demandée est trop grande. Prière de changer le zoom ou la résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Sauvegarder le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Charger le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21662,25 +21842,50 @@
 "{1} attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Placer un marque-page WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Téléchargement automatique"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Impossible de trouver l’objet de la carte."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier"
@@ -21749,10 +21954,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"Il a été demandé à Remote Control d’importer des données depuis l’URL "
-"suivante :"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21858,5 +22060,5 @@
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr ""
+msgstr "multipolygone"
 
 #. relation type
@@ -21864,5 +22066,5 @@
 msgctxt "Relation type"
 msgid "network"
-msgstr ""
+msgstr "réseau"
 
 #. relation type
@@ -21870,5 +22072,5 @@
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "transport en commun"
 
 #. relation type
@@ -21876,5 +22078,5 @@
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "restriction"
 
 #. relation type
@@ -21882,5 +22084,5 @@
 msgctxt "Relation type"
 msgid "route"
-msgstr ""
+msgstr "route"
 
 #. relation type
@@ -21888,5 +22090,5 @@
 msgctxt "Relation type"
 msgid "site"
-msgstr ""
+msgstr "site"
 
 #. relation type
@@ -21894,5 +22096,5 @@
 msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
+msgstr "cours d'eau"
 
 #. Strings in JFileChooser
@@ -22177,5 +22379,5 @@
 #: build/trans_plugins.java:20
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "Téléchargements de données OSM le long du chemin"
 
 #. Plugin Duplicate-Way
@@ -22276,16 +22478,21 @@
 "graphiques lorsque vous avez du mal à cliquer sans déplacer la souris."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d’arrière plan provenant d’OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d’OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22295,5 +22502,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22301,5 +22508,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22310,5 +22517,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22319,10 +22526,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ajoute le thème JGoodies."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22331,15 +22538,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet à d’autres applications d’envoyer des commandes vers JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Greffon pour annuler des groupes de modifications"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22349,5 +22556,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22359,10 +22566,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de calcul d’itinéraire."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22371,5 +22578,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22380,15 +22587,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22401,15 +22608,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22418,5 +22625,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22427,5 +22634,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22436,10 +22643,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22450,5 +22657,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22458,5 +22665,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22467,20 +22674,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
+msgstr "Active la recherche de points importés à partir d'un fichier gpx"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Sélectionne une séquence de chemins connectés non-ramifiés"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22490,5 +22697,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22531,4 +22738,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22561,10 +22769,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Routes"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Rues"
@@ -22575,5 +22783,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autoroute"
@@ -22582,5 +22790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Modifier une autoroute"
@@ -22617,10 +22825,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Référence"
@@ -22634,8 +22842,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Nombre de voies"
@@ -22654,13 +22862,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max. (km/h)"
@@ -22694,17 +22902,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Sens unique"
@@ -22741,17 +22949,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22785,17 +22993,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -22826,17 +23034,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Tranchée"
@@ -22867,17 +23075,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Remblai"
@@ -22885,5 +23093,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Bretelle d’accès à une autoroute"
@@ -22892,5 +23100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Modifier une bretelle d’accès à une autoroute"
@@ -22898,5 +23106,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Voie rapide"
@@ -22905,5 +23113,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Modifier une voie rapide"
@@ -22913,6 +23121,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Route à accès réglementé"
@@ -22920,5 +23128,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Bretelle d’accès à une voie rapide"
@@ -22927,5 +23135,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Modifier une bretelle d’accès à une voie rapide"
@@ -22938,5 +23146,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Route primaire"
@@ -22945,5 +23153,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Modifier une route primaire"
@@ -22951,10 +23159,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Bretelle d’accès à une route primaire"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Modifier une bretelle d’accès à une route primaire"
@@ -22966,5 +23174,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Route secondaire"
@@ -22974,5 +23182,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Modifier une route secondaire"
@@ -22980,5 +23188,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Route tertiaire"
@@ -22988,5 +23196,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Modifier une route tertiaire"
@@ -22998,5 +23206,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Route mineure"
@@ -23006,5 +23214,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Modifier une route mineure"
@@ -23014,6 +23222,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Aires de croisement"
@@ -23036,15 +23244,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -23056,5 +23264,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Rue résidentielle"
@@ -23063,5 +23271,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Modifier une rue résidentielle"
@@ -23081,12 +23289,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Revêtement"
@@ -23108,166 +23316,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "avec revêtement"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "sans revêtement"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asphalte"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "béton"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "métal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "bois"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "pavés"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "galets"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "gravier"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "galets"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "compact"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "gazon"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "herbe"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sable"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "terre"
@@ -23275,5 +23483,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Zone de rencontre"
@@ -23282,5 +23490,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Modifier une zone de rencontre"
@@ -23288,5 +23496,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Rue piétonne"
@@ -23295,5 +23503,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Modifier une rue piétonne"
@@ -23301,5 +23509,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Voie d’accès"
@@ -23308,5 +23516,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Modifier une voie d’accès"
@@ -23316,18 +23524,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Type de voie d’accès"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "Ruelle (entre bâtiments principalement)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "allée (entrée de garage, de propriété, généralement privée)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "Petite voie de parking"
@@ -23335,5 +23543,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Voie de parking"
@@ -23343,10 +23551,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Modifier une voie de parking"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Route (type inconnu)"
@@ -23355,5 +23563,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Modifier une route (type inconnu)"
@@ -23361,14 +23569,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Chemin en construction"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Modifier une route en construction"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Carrefour"
@@ -23384,5 +23592,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rond-point"
@@ -23391,5 +23599,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Rue à accès restreint"
@@ -23398,15 +23606,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Modifier les restrictions d’une route"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Péage"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Sans issue"
@@ -23414,5 +23622,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Accès"
@@ -23438,4 +23646,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23443,4 +23652,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23516,236 +23731,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privé"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "autorisé"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "véhicules agricoles"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "sylviculture"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "livraison"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "non"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Agricole"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "désigné"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privé"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "autorisé"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "véhicules agricoles"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "sylviculture"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "livraison"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "non"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Agricole"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "désigné"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "officiel"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Transport de marchandises"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Poids-lourds"
@@ -23760,10 +23982,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Chevaux"
@@ -23779,10 +24001,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motos"
@@ -23797,19 +24020,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Voitures"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport public"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Vitesse min. (km/h)"
@@ -23817,20 +24040,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Poids max. (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Hauteur maximale (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Largeur maximale (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Longueur maximale (mètres)"
@@ -23838,5 +24061,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rond-point"
@@ -23847,5 +24070,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Modifier un carrefour"
@@ -23865,10 +24088,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autoroute"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "bretelle d’accès à une autoroute"
@@ -23890,10 +24113,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "voie rapide"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "bretelle d’accès à une voie rapide"
@@ -23915,10 +24138,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "route primaire"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "bretelle d’accès à une route primaire"
@@ -23940,5 +24163,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23953,9 +24176,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "route tertiaire"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "mineure"
@@ -23969,9 +24192,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "rue résidentiel"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "living_street"
@@ -24015,10 +24238,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "voie d’accès"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "voie réservée aux bus guidés"
@@ -24048,5 +24271,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -24058,10 +24281,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Modifier un pont"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Modifier un tunnel"
@@ -24069,10 +24292,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Chemins"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Piste"
@@ -24081,35 +24304,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Modifier une piste"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Type de revêtement"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "catégorie 1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "catégorie 2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "catégorie 3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "catégorie 4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "catégorie 5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Niveau de difficulté VTT"
@@ -24117,5 +24340,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Chemin partagé"
@@ -24124,76 +24347,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Modifier un chemin partagé"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Échelle CAS (classification du Club Alpin Suisse)"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "randonnée en montagne"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "randonnée en montagne exigeante"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "randonnée alpine"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "randonnée alpine exigeante"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "randonnée alpine difficile"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "excellent"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "bon"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "rouge"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "mauvais"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "horrible"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Fauteuils roulants"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Motoneige"
@@ -24202,5 +24425,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Chemin équestre"
@@ -24208,5 +24431,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Modifier un chemin équestre"
@@ -24214,5 +24437,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Piste cyclable"
@@ -24230,11 +24453,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Modifier une piste cyclable"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Piétons"
@@ -24242,5 +24465,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Chemins séparés pour piétions et cyclistes"
@@ -24248,5 +24471,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Chemin pour piétions et cyclistes"
@@ -24254,5 +24477,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Chemin réservé aux piétons"
@@ -24261,5 +24484,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Modifier un chemin réservé aux piétons"
@@ -24267,5 +24490,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Escaliers"
@@ -24275,10 +24498,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Modifier des escaliers"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Nombre de places"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Échangeur"
@@ -24286,15 +24515,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Modifier un échangeur"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Numéro"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Aire de repos"
@@ -24302,5 +24531,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Modifier une aire de repos"
@@ -24308,10 +24537,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -24340,36 +24570,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Compagnie"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Restaurer"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Modifier un restaurant"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Borne d’appel d’urgence"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Feux tricolores"
@@ -24379,5 +24630,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Type de passage piéton"
@@ -24386,27 +24637,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "îlot"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "non marqué"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -24414,6 +24665,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -24422,11 +24673,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Aide à la traversée"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Nom du type de passage (RU)"
@@ -24434,30 +24685,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pélican"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pégase"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "TIGER"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -24465,67 +24716,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Passage piéton"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Modifier un passage piéton"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Type (RU)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Ralentisseur"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Modifier un ralentisseur"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "petit dos d’âne"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "rétrécissement"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "coussin berlinois"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "dos d’âne"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "plateau"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Aire de croisement"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Modifier l'aire de croisement"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini giratoire"
@@ -24536,14 +24725,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Sens"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "sens horaire"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Passage piéton"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Modifier un passage piéton"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Type (RU)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Ralentisseur"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Modifier un ralentisseur"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "petit dos d’âne"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "rétrécissement"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "coussin berlinois"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "dos d’âne"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "plateau"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Aire de croisement"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Modifier l'aire de croisement"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Rond-point interne"
@@ -24553,5 +24804,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Limite communale"
@@ -24559,15 +24810,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Modifier une limite communale"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Nom secondaire"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Radar fixe"
@@ -24576,11 +24827,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Borne d’appel d’urgence"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Descente dangereuse"
@@ -24588,5 +24834,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Descente très dangereuse"
@@ -24594,5 +24840,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Boîte avec sable / sel"
@@ -24602,10 +24848,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Gué"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Modifier un gué"
@@ -24613,5 +24859,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Col de montagne"
@@ -24619,5 +24865,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Modifier un col de montagne"
@@ -24626,10 +24872,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Altitude"
@@ -24637,5 +24883,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barrières"
@@ -24643,5 +24889,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Plot"
@@ -24649,5 +24895,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Modifier une bitte d’amarrage"
@@ -24692,16 +24938,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé :"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Barrière pour cycles"
@@ -24710,5 +24956,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Obstacle"
@@ -24716,5 +24962,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Grille à bétail"
@@ -24722,10 +24968,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Modifier une grille à bétail"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Entrée de voie de bus (Allemagne)"
@@ -24733,15 +24979,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Pointes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Modifier pointes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Péage"
@@ -24749,5 +24995,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Modifier un péage"
@@ -24755,10 +25001,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Douane"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Modifier douane"
@@ -24767,5 +25013,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Haie"
@@ -24776,22 +25022,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Clôture"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "clôture"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "clôture en bois"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "clôture en fil de fer"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Mur"
@@ -24799,5 +25045,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Rempart"
@@ -24806,5 +25052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Mur de soutènement"
@@ -24815,10 +25061,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Entrée"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Editez une entrée"
@@ -24826,5 +25072,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Porte"
@@ -24832,50 +25078,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Modifier une porte"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Barrière"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Modifier une barrière"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Porte de clôture"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Modifier une Porte de clôture"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Barrière mobile"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Modifier une barrière mobile"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Portillon"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Modifier un portillon"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Échalier"
@@ -24883,25 +25129,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Modifier un échalier"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Tourniquet"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Modifier un tourniquet"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Entrée de château, de fort..."
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Modifier une entrée de château, de fort..."
@@ -24909,25 +25155,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Hydrographie"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Source"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Modifier une source"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -24935,10 +25170,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Modifier un canal d’évacuation"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Fossé"
@@ -24946,10 +25181,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Modifier un fossé"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Ruisseau"
@@ -24957,10 +25192,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Modifier un ruisseau"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Canal"
@@ -24968,10 +25203,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Modifier un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Fleuve, rivière"
@@ -24981,59 +25216,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Modifier un fleuve/une rivière"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Source"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Modifier une source"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Cascade"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Modifier une cascade"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Seuil"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Modifier un seuil"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Barrage"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Modifier un barrage"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Bassin"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Modifier un bassin"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Bassin de retenue"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Modifier un bassin de retenue"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Réservoir couvert"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Modifier un réservoir couvert"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Modifier une surface d'eau"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Terre"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Editez un terrain"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Bassin"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Modifier un bassin"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Bassin de retenue"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Modifier un bassin de retenue"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Réservoir couvert"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Modifier un réservoir couvert"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Ligne côtière"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Modifier une ligne côtière"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Lit d’un fleuve/d’une rivière"
@@ -25042,10 +25331,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Modifier le lit d’un fleuve/d’une rivière"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Zone humide"
@@ -25056,14 +25346,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Modifier une zone humide"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "marécage"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "tourbière"
@@ -25077,35 +25367,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "vasière"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Terrain boueux"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Modifier un terrain boueux"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Plage"
@@ -25113,20 +25403,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Modifier une plage"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Baie"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Modifier une baie"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Falaise"
@@ -25134,145 +25424,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Modifier une falaise"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Ligne côtière"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Modifier une ligne côtière"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Shopping"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Terminal pour ferry"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Modifier un terminal pour ferry"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Voiture"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "verte"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "vélo"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Modifier un itinéraire de ferry"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Chantier naval"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Modifier un chantier naval"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dock"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Modifier un dock"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Barrage"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Modifier un barrage"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Voie fluviale"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Marina"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Modifier une marina"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Jetée/Ponton"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Modifier une jetée/un ponton"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Écluse"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Seuil"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Modifier un seuil"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Cascade"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Modifier une cascade"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Point de retournement"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Modifier une marina"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Jetée/Ponton"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Modifier une jetée/un ponton"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Terminal pour ferry"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Modifier un terminal pour ferry"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Plan incliné"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -25282,16 +25643,38 @@
 msgstr "Modifier un plan incliné"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Chantier naval"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Modifier un chantier naval"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dock"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Modifier un dock"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Voie ferrée"
@@ -25299,5 +25682,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Modifier une voie ferrée"
@@ -25327,7 +25710,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Écartement (mm)"
@@ -25343,8 +25726,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Type"
@@ -25358,29 +25741,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "triage"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "voie de garage"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "embranchement"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Électrifié"
@@ -25393,8 +25776,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "par câble aérien"
@@ -25465,8 +25848,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25478,8 +25861,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Tension"
@@ -25492,8 +25875,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Fréquence (Hz)"
@@ -25506,23 +25889,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Voie ferrée étroite"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifier une voie ferrée étroite"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -25530,50 +25913,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Modifier un monorail"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Voie ferrée touristique"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Modifier une voie ferrée touristique"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Train-Tram"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Modifier un Train-Tram"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Métro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Modifier un métro"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tramway"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Modifier un tramway"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Voie réservée aux bus guidés"
@@ -25581,5 +25964,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Modifier une voie réservée aux bus guidés"
@@ -25588,10 +25971,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Voie désaffectée"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Modifier une voie désaffectée"
@@ -25600,9 +25983,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Types optionels"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -25611,5 +25994,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Passage à niveau routier"
@@ -25618,5 +26001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Passage à niveau piéton"
@@ -25626,5 +26009,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Type de passage à niveau"
@@ -25632,5 +26015,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -25639,5 +26022,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Buttoir"
@@ -25646,10 +26029,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Transport aérien par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -25657,10 +26040,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Modifier un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -25668,10 +26051,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Modifier un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -25679,10 +26062,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Modifier un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Œufs"
@@ -25690,10 +26073,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Modifier des œufs"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25702,5 +26086,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25708,5 +26092,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25715,5 +26099,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25721,5 +26105,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Station service"
@@ -25729,69 +26113,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Modifier une station service"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "terre"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol YPF"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indépendant"
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25808,34 +26215,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25843,37 +26251,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25894,33 +26313,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25929,170 +26350,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-Ven 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "magasin"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Épicerie"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosque à journaux"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Types de carburant :"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Gazole"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Biogazole"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Gazole de type GTL"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Gazole pour poids lourds"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Indice d’octane de 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Indice d’octane de 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Indice d’octane de 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "Indice d’octane de 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mélange à 10% d’éthanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (Superéthanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (Gaz de Pétrole Liquéfié)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNV (Gaz Naturel pour Véhicules)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr "Mélange 1/25 (cyclomoteur)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "Mélange 1/50 (cyclomoteur)"
@@ -26100,4 +26543,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -26109,6 +26553,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parking"
@@ -26117,5 +26561,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Modifier un parking"
@@ -26126,25 +26570,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Numéro de référence"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "couvert"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "souterraine"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Parc relais"
@@ -26153,54 +26599,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Payant"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Capacité"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Emplacements pour handicapés"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Emplacements pour femmes"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Emplacements pour parents"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Voir le Wiki pour les autres types de capacité."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Lavage"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Modifier un espace de lavage de voitures"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Concessionnaire automobile"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Modifier une concession"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Garagiste"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Modifier un garagiste"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Type"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Modifier un arbre"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Contenu"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Numéro de téléphone"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Numéro de télécopie"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Site Internet"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Adresse électronique"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Location"
@@ -26209,10 +26799,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Modifier une location de voiture"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Station d’autopartage"
@@ -26220,28 +26809,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Modifier une station d’autopartage"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Modifier un parking à vélo"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacité"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motos"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Modifier une autoroute"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Aire de repos"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Échelle"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "mauvais"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Pré-réglages"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Vêtements"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Modifier un parking à vélo"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacité"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Magasin de vélos"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Modifier un magasin de vélo"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Modifier une location de vélos"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -26251,5 +26899,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -26257,5 +26905,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -26263,5 +26911,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -26269,5 +26917,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Modifier une halte ferroviaire"
@@ -26275,5 +26923,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Arrêt de tramway"
@@ -26282,5 +26930,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Modifier un arrêt de tramway"
@@ -26288,5 +26936,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Quai"
@@ -26295,5 +26943,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Modifier un quai"
@@ -26305,5 +26953,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Numéro de voie"
@@ -26311,10 +26959,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -26323,10 +26971,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Modifier une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Fauteuils roulants"
@@ -26335,5 +26983,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -26342,5 +26990,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Modifier une gare routière"
@@ -26348,5 +26996,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -26356,13 +27004,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Modifier un arrêt de bus"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Abri"
@@ -26370,19 +27017,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Banc"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Bande rugueuse"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Modifier une plateforme de bus"
@@ -26390,5 +27037,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -26396,5 +27043,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Modifier une station de taxi"
@@ -26402,10 +27049,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aéroport"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Aéroport"
@@ -26413,5 +27060,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Modifier un aéroport"
@@ -26419,10 +27066,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "Code AITA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "Code OACI"
@@ -26431,5 +27078,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Piste d’atterrissage / d’envol"
@@ -26437,5 +27084,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Modifier une piste d’atterrissage / d’envol"
@@ -26443,5 +27090,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Voie de circulation"
@@ -26449,5 +27096,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Modifier une voie de circulation"
@@ -26455,5 +27102,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Héliport"
@@ -26461,5 +27108,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Modifier héliport"
@@ -26469,5 +27116,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Aire de stationnement"
@@ -26477,5 +27124,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar d’aéroport"
@@ -26486,6 +27133,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Balise lumineuse"
@@ -26495,5 +27142,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Manche à air"
@@ -26502,5 +27149,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Aérogare"
@@ -26508,5 +27155,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Modifier un aérogare"
@@ -26514,15 +27161,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Modifier une porte d’embarquement"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Voyage"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -26534,5 +27181,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -26541,5 +27188,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Modifier un hôtel"
@@ -26552,8 +27199,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Étoiles"
@@ -26577,34 +27224,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "Accès Internet"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "wlan"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -26618,168 +27265,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "aérogare"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
-msgstr ""
+msgstr "Accès à internet payant"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "Fumer"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "dédié"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "séparé"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
-msgstr ""
-
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Numéro de téléphone"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
+msgstr "isolé"
 
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26787,20 +27339,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Modifier un motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Chambre d’hôtes"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Modifier une chambre d’hôtes"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Chalet"
@@ -26808,10 +27360,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Modifier un chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Auberge de jeunesse"
@@ -26819,30 +27371,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Modifier une auberge de jeunesse"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Refuge"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Modifier un refuge"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Site pour caravanes"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Modifier un site pour caravanes"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Camping"
@@ -26850,10 +27403,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Modifier un camping"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Restauration"
@@ -26864,5 +27417,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26870,5 +27423,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Modifier un restaurant"
@@ -26876,5 +27429,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -26882,79 +27437,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italienne"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chinoise"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grecque"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "allemande"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indienne"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "régionale"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thaïlandaise"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexicaine"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japonaise"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "française"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
-msgstr ""
+msgstr "micro-brasserie"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast-Food"
@@ -26962,29 +27517,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifier un fast-food"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "poisson et frites"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "poulet"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
-msgstr ""
+msgstr "Aire de restauration"
 
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
-msgstr ""
+msgstr "Modifier une aire de restauration"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Café"
@@ -26992,10 +27547,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Modifier un café"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub (anglo-saxon)"
@@ -27003,20 +27563,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Modifier un pub (anglo-saxon)"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Modifier un biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -27024,10 +27584,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Modifier un bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -27035,25 +27595,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Modifier une boîte de nuit"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Modifier une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Musée"
@@ -27061,9 +27621,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Modifier un musée"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -27072,9 +27632,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Modifier un zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Parc d’attraction"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Modifier un parc d’attraction"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Œuvre d'art"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Modifier une œuvre d’art"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -27082,50 +27663,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Modifier un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Parc d’attraction"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Modifier un parc d’attraction"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Œuvre d'art"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Modifier une œuvre d’art"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Modifier un abri"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "place à feu"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Site de pique-nique"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Modifier un site de pique-nique"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Niveau de détail"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "carte topographique"
@@ -27163,5 +27745,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -27169,28 +27751,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "carte schématique"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Description"
@@ -27200,5 +27782,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Affichage des itinéraires de :"
@@ -27206,5 +27788,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Randonnée"
@@ -27212,6 +27794,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -27219,5 +27801,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -27225,6 +27807,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Ski"
@@ -27232,5 +27814,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Équitation"
@@ -27238,53 +27820,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "…autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Panneau d’informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "annonce"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "flore"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
-msgstr ""
+msgstr "mât"
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Terminal d’informations"
@@ -27292,55 +27874,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Description"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio par téléphone portable ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Point d’information"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Modifier un abri"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr ""
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Site de pique-nique"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Modifier un site de pique-nique"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Château"
@@ -27349,19 +27910,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Modifier un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Modifier des ruines"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -27370,9 +27931,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Modifier un site archéologique"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -27380,10 +27941,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Modifier un lieu de bataille"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Site paléontologique"
@@ -27391,5 +27952,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Modifier un site paléontologique"
@@ -27397,15 +27958,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Modifier un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Mémorial"
@@ -27413,55 +27974,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Modifier un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Modifier une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Modifier une chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Modifier une pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Modifier un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Terrain de jeux pour enfants"
@@ -27469,35 +28030,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Modifier un terrain de jeux pour enfants"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Modifier un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Terrains de sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Modifier un stade"
@@ -27511,6 +28072,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "Selectionnez un sport :"
@@ -27926,6 +28487,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27960,240 +28521,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multisport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "tir à l’arc"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "athlétisme"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "football americain"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "football australien"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "boulingrin"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "football canadien"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "escalade"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "filets de cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "cyclisme"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "course de chiens"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "football gaélique"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastique"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "course de chevaux"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "sport de raquettes"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "ligue de rugby"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "union de rugby"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "roller"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "natation"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "tennis de table"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Modifier un centre sportif"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Modifier un terrain de sport"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Modifier un circuit"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Modifier un terrain de golf"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Modifier un minigolf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sports"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multisport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Modifier un terrain multisport"
@@ -28210,5 +28771,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -28235,23 +28795,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "type"
@@ -28268,5 +28836,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -28293,211 +28860,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "terrain"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "centre de sports"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "piste"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Modifier un bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Modifier l’athlétisme"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Modifier le tir à l’arc"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Modifier l'escalade"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Modifier le canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Modifier le cyclisme"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Modifier une course de chiens"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Équitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Modifier un sport équestre"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Modifier une course de chevaux"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Modifier la gymnastique"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Sport mécanique"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Modifier un sport mécanique"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Roller"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Modifier le roller"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Modifier le skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Modifier la natation"
@@ -28505,52 +29075,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Type de ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "alpin"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snowpark"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "noire"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "orange"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Tir sportif"
@@ -28558,204 +29128,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Modifier le tir sportif"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Sports de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Modifier le football"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Modifier le football australien"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
-msgstr ""
+msgstr "Football américain"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Modifier le baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Modifier le basketball"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Modifier un parcours de golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Jeu de boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Modifier le jeu de boules"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Boulingrin"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Modifier le boulingrin"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Modifier le cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Modifier des filets de cricket"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Modifier le croquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Modifier le hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Modifier la pelote basque"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Sport de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Modifier un sport de raquette"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Modifier le tennis de table"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Modifier le tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Sport mécanique"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Modifier un sport mécanique"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Avertissement"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Modifier un parking"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Automobiles"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Modifier un sport mécanique"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Modifier le roller"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Modifier douane"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Voiture"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Modifier un télécabine"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Bâtiment"
@@ -28763,5 +29399,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Bâtiment public"
@@ -28769,10 +29405,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Modifier un bâtiment public"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Mairie"
@@ -28780,10 +29416,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Modifier une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambassade"
@@ -28791,10 +29427,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Modifier une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -28803,10 +29439,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Modifier un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Prison"
@@ -28815,10 +29451,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Modifier une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Commissariat de police"
@@ -28828,10 +29464,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Modifier un commissariat de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -28840,10 +29476,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Modifier une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -28851,5 +29487,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Modifier un bureau de poste"
@@ -28857,15 +29493,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Modifier un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "École"
@@ -28873,10 +29509,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Modifier une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Université"
@@ -28884,10 +29520,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Modifier une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -28895,5 +29531,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Modifier un établissement d’enseignement supérieur"
@@ -28901,5 +29537,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cinéma"
@@ -28908,10 +29544,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Modifier un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bibliothèque"
@@ -28920,9 +29556,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Modifier une bibliothèque"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -28930,10 +29566,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Modifier un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Théâtre"
@@ -28942,10 +29578,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Modifier un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -28955,5 +29591,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Modifier un lieu de culte"
@@ -28962,6 +29598,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -28970,66 +29606,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaïsme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "bouddhisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "christianisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindouisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jaïnisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judaïsme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikhisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoïsme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Dénomination"
@@ -29038,189 +29674,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglicanisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "catholicisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "évangélisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "témoins de Jehovah"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luthérianisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "méthodisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormonisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "orthodoxie"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecôtisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbytérianisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestantisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "chiisme"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnisme"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresses"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Modifier l’adresse"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Numéro du bâtiment"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nom de la maison"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nom de la rue"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Nom de la ville"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Code postal"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Indicatif du pays"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Modifier une interpolation d’adresse"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Numérotation"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "pair"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "impair"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alphabétique"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Modifier une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Structure de grande hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Modifier une structure de grande hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Type de structure"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -29228,25 +29794,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Modifier un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Modifier un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Phare"
@@ -29254,10 +29820,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Modifier un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -29265,10 +29831,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Modifier un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -29278,41 +29844,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Modifier une canalisation"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "turbine à gaz"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "chaleur"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Commune"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "sous-marine"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "aérienne"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -29322,10 +29888,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Modifier une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Grue"
@@ -29333,5 +29899,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Modifier une grue"
@@ -29339,10 +29905,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Modifier une balise lumineuse"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -29350,10 +29916,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Modifier un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -29361,23 +29927,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Modifier une caméra de surveillance"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "intérieur"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "extérieur"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -29387,35 +29953,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Modifier une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "éolienne"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hydroélectrique"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossile"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nucléaire"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "solaire photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Station électrique"
@@ -29424,10 +29990,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Modifier une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -29436,5 +30002,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Modifier un transformateur électrique"
@@ -29442,10 +30008,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Référence de la ligne"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -29456,23 +30022,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Modifier un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "pylône"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Ligne électrique"
@@ -29481,76 +30047,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Modifier une ligne électrique"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2638
+msgstr "Ligne électrique"
+
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr ""
+msgstr "Ligne à basse tension"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toilettes publiques"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limité"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Paiement"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Cabine téléphonique"
@@ -29559,5 +30125,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Modifier une cabine téléphonique"
@@ -29565,5 +30131,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Pièces"
@@ -29571,5 +30137,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Billets"
@@ -29577,5 +30143,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Porte-monnaie électronique"
@@ -29583,5 +30149,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -29589,15 +30155,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Cartes de crédit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Point de recyclage"
@@ -29606,5 +30172,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Modifier un point de recyclage"
@@ -29612,35 +30178,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Canettes"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Vêtements"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Ferraille"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Poubelle"
@@ -29648,5 +30209,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Modifier une poubelle"
@@ -29655,31 +30216,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Dossier"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marron"
@@ -29758,5 +30319,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29766,31 +30327,31 @@
 msgstr "vert"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -29798,31 +30359,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "moyenne"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "grande"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Camouflé"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Verrouillé"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontaine"
@@ -29831,10 +30392,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Modifier une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Point d’eau potable"
@@ -29843,10 +30404,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Modifier un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Borne incendie"
@@ -29855,5 +30416,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Modifier une borne incendie"
@@ -29861,501 +30422,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Piéton"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarché"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Modifier un supermarché"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Épicerie"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Modifier une épicerie"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosque à journaux"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Modifier un kiosque à journaux"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Boucherie"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Modifier une boucherie"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Boulangerie"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Modifier une boulangerie"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Magasin bio"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Modifier un magasin bio"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alcool"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Modifier un magasin d’alcool"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Boissons"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Modifier un magasin de boissons"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Commerce"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Droguerie"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Modifier une droguerie"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Salon de coiffure"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Modifier un salon de coiffure"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Opticien"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Modifier un opticien"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Modifier un magasin d’informatique"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Chaussures"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Modifier un magasin de chaussures"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Sports en plein air"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Modifier un magasin de sports en plein air"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Modifier un magasin de sport"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Pressing"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Modifier un pressing"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Laverie"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Modifier une laverie"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "autre voie ferrée"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Modifier une voie ferrée"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Informatique"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Modifier un magasin d’informatique"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Électronique"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Modifier un magasin d’électronique"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hi-Fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Modifier un magasin Hi-Fi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Vidéoclub"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Modifier un vidéoclub"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Fleuriste"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Modifier un fleuriste"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Jardinerie"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Modifier une jardinerie"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Quincaillerie"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Modifier une quincaillerie"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Bricolage"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Modifier un magasin de bricolage"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Ameublement"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Modifier un magasin d’ameublement"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Papeterie"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Modifier une papeterie"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Librairie"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Modifier une librairie"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Agence de voyage"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Modifier une agence de voyage"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Jouets"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Modifier un magasin de jouets"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Distributeur automatique"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Modifier un distributeur automatique"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Produits vendus"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "tickets de transport public"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "plans de transport public"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "tickets de parking"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "nourriture"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "boissons"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "bonbons"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigarettes"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "photos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "alimentation animale"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "journaux"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "jouets"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "timbres"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "cartes SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "bons téléphoniques"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "vouchers"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "Tunnel cyclable"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "préservatifs"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampons"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "sacs pour excrément"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Cartes de fidélité"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Argent"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banque"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Modifier une banque"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Distributeur automatique"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Bureau de change"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Modifier un bureau de change"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Modifier un distributeur automatique"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Santé"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Cabinet médical"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Modifier un cabinet médical"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Cabinet dentaire"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Modifier un cabinet dentaire"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Pharmacie"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Modifier une pharmacie"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Dispensaire"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hôpital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Modifier un hôpital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Tour d’abandon"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Modifier une tour d’abandon"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Commerce"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Concessionnaire automobile"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Modifier une concession"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Magasin de vélos"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Modifier un magasin de vélo"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarché"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Modifier un supermarché"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Droguerie"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Modifier une droguerie"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Épicerie"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Modifier une épicerie"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosque à journaux"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Modifier un kiosque à journaux"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Librairie"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Modifier une librairie"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Agence de voyage"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Modifier une agence de voyage"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Boucherie"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Modifier une boucherie"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Boulangerie"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Modifier une boulangerie"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Fleuriste"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Modifier un fleuriste"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Magasin bio"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Modifier un magasin bio"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alcool"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Modifier un magasin d’alcool"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Boissons"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Modifier un magasin de boissons"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Informatique"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Modifier un magasin d’informatique"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Électronique"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Modifier un magasin d’électronique"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hi-Fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Modifier un magasin Hi-Fi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Ameublement"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Modifier un magasin d’ameublement"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Jardinerie"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Modifier une jardinerie"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Quincaillerie"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Modifier une quincaillerie"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Bricolage"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Modifier un magasin de bricolage"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Papeterie"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Modifier une papeterie"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Salon de coiffure"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Modifier un salon de coiffure"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Chaussures"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Modifier un magasin de chaussures"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Jouets"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Modifier un magasin de jouets"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Vidéoclub"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Modifier un vidéoclub"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Pressing"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Modifier un pressing"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Laverie"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Modifier une laverie"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Sports en plein air"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Modifier un magasin de sports en plein air"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Modifier un magasin de sport"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Opticien"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Modifier un opticien"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Distributeur automatique"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Modifier un distributeur automatique"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Produits vendus"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "tickets de transport public"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "plans de transport public"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "tickets de parking"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "nourriture"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "boissons"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "bonbons"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigarettes"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "photos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "alimentation animale"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "journaux"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "jouets"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "timbres"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "cartes SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "bons téléphoniques"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "vouchers"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "Tunnel cyclable"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "préservatifs"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampons"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "sacs pour excrément"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Cartes de fidélité"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Argent"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banque"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Modifier une banque"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Distributeur automatique"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Bureau de change"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Modifier un bureau de change"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Modifier un distributeur automatique"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Santé"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Cabinet médical"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Modifier un cabinet médical"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Cabinet dentaire"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Modifier un cabinet dentaire"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Pharmacie"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Modifier une pharmacie"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Dispensaire"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hôpital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Modifier un hôpital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -30364,5 +30927,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Modifier un point d’accès d’urgence"
@@ -30371,15 +30934,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890)"
@@ -30387,5 +30950,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Cabinet vétérinaire"
@@ -30394,368 +30957,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Modifier un cabinet vétérinaire"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Géographie"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Frontières"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nationale"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Modifier une frontière nationale"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrative"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Modifier une frontière administrative"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civile"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Modifier une frontière civile"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Électorale"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Modifier une zone électorale"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parc national"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Modifier une frontière d’un parc national"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Lieux"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Modifier un continent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Pays"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Modifier un pays"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Département"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Modifier un département"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Région"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Modifier une région"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Comté/Canton"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Modifier un comté/canton"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Modifier une ville"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Ville de 10 000 à 100 000 habitants"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Modifier une ville"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Banlieue"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Modifier une banlieue"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Village"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Modifier un village"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Hameau"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Modifier un hameau"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Lieu-dit"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Modifier un lieu-dit"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Sommet"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Modifier un sommet"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glacier"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Modifier un glacier"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Volcan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Modifier un volcan"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Entrée de grotte"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Modifier une entrée de grotte"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "île"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Modifier une île"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "îlot"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Modifier un îlot"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "nature"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Arbre"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Modifier un arbre"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Nom botanique"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Bois"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Modifier un bois"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "conifères"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "feuillus"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "conifères et feuillus"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Forêt"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Modifier une  forêt"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Réserve naturelle"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Modifier une réserve naturelle"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Entrée de grotte"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Modifier une entrée de grotte"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Sommet"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Modifier un sommet"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glacier"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Modifier un glacier"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Volcan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Modifier un volcan"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Frontières"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nationale"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Modifier une frontière nationale"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrative"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Modifier une frontière administrative"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civile"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Modifier une frontière civile"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Électorale"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Modifier une zone électorale"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parc national"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Modifier une frontière d’un parc national"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Zone d’éboulements"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Modifier une zone d’éboulements"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Talus"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Modifier un talus"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Broussailles"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Modifier des broussailles"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Lande"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Modifier une lande"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Arbre"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Modifier un arbre"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Nom botanique"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Bois"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Modifier un bois"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "conifères"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "feuillus"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "conifères et feuillus"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Forêt"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Modifier une  forêt"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Réserve naturelle"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Modifier une réserve naturelle"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Zone d’éboulements"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Modifier une zone d’éboulements"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Broussailles"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Modifier des broussailles"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Talus"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Modifier un talus"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Lande"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Modifier une lande"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Cour de ferme"
@@ -30764,45 +31333,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Modifier une cour de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Terre arable"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Modifier une terre arable"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Modifier une prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Modifier une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Modifier des jardins familiaux"
@@ -30810,25 +31379,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Modifier un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Modifier une zone herborée"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Village green (anglo-saxon)"
@@ -30836,10 +31405,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Modifier un village green (anglo-saxon)"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Espace publique"
@@ -30847,20 +31416,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Modifier un espace publique"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Modifier un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -30868,5 +31437,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifier une aire de jeux"
@@ -30874,15 +31443,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Modifier une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -30890,9 +31459,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Modifier un petit cimetière"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -30900,39 +31469,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Modifier un cimetière"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Zone de commerces"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Modifier une zone de commerces"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Zone de bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Modifier une zone de bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Modifier une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -30940,15 +31509,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Modifier une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Terrain militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Modifier un terrain militaire"
@@ -30956,52 +31525,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Chantier"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Modifier un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Terrain vague"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Modifier un terrain vague"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Zone d’aménagement"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Modifier une zone d’aménagement"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Modifier une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Modifier une carrière"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Station"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresses"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Modifier l’adresse"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Numéro du bâtiment"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nom de la maison"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nom de la rue"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Nom de la ville"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Code postal"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Indicatif du pays"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "Code AITA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "Code AITA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Modifier une interpolation d’adresse"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Numérotation"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "pair"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "impair"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alphabétique"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Contenu"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Ajouter des informations sur l’auteur"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Image"
 
 #. item "Relations/Multipolygon"
@@ -31009,5 +31711,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -31019,5 +31721,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "segment extérieur"
@@ -31025,5 +31727,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -31031,7 +31733,7 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
-msgstr ""
+msgstr "Frontière"
 
 #. item "Relations/Boundary"
@@ -31040,42 +31742,42 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
-msgstr ""
+msgstr "Éditer la frontière"
 
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
-msgstr ""
+msgstr "Type de frontière"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
-msgstr ""
-
-#: build/trans_presets.java:3416
+msgstr "administrative"
+
+#: build/trans_presets.java:3551
 msgid "national"
-msgstr ""
-
-#: build/trans_presets.java:3416
+msgstr "nationale"
+
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "civile"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "politique"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Niveau administrative"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
-msgstr ""
+msgstr "Sous-zone"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Centre d'administration"
@@ -31083,5 +31785,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -31090,5 +31792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -31096,34 +31798,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "Interdiction d’aller tout droit"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "Obligation d’aller tout droit"
@@ -31132,15 +31834,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "chemin d’origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "nœud ou chemin \"via\""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "au chemin"
@@ -31148,5 +31850,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Itinéraire"
@@ -31155,5 +31857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Modifier un itinéraire"
@@ -31161,132 +31863,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Type d’itinéraire"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "vélo"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -31354,5 +31945,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31362,9 +31953,9 @@
 msgstr "chemin pour piétons"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "détour"
@@ -31378,10 +31969,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Symbole"
@@ -31389,31 +31980,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "État de l’itinéraire"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Couleur (hexadécimale)"
@@ -31422,30 +32013,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "segment d’itinéraire"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "point d’arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "point d’arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "point d’arrêt précédent"
@@ -35423,7 +36014,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr "Landsat (mirroir)"
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35545,8 +36135,49 @@
 msgstr "Sicile - Italie"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 - Italie"
+
+#~ msgid "Keep backup files"
+#~ msgstr "Garder les fichiers de sauvegarde"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "Vous ne pouvez pas aligner deux segments qui sont connectés.\n"
+#~ "S'il vous plait, choisissez  deux segments qui ne partagent aucun nœud."
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Aligner les segments.</b> Appuyez sur <b><i><span style=\"color:"
+#~ "green\">Shift-A</span></i></b>. Sinon, vous pouvez trouver la commande "
+#~ "dans le menu\n"
+#~ " <b>Outils</b> ou pouvez vouloir placer l'action dans la <b>barre "
+#~ "d'outils</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Voie fluviale"
 
 #~ msgid "Move"
@@ -35599,7 +36230,4 @@
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dans la trace."
-
-#~ msgid "Image"
-#~ msgstr "Image"
 
 #~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 22859)
+++ applications/editors/josm/i18n/po/gl.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-07-28 13:21+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Aviso"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -409,4 +409,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -424,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1069,5 +1070,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1481,13 +1482,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1496,5 +1497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1502,9 +1503,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1512,5 +1513,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1544,8 +1545,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1554,9 +1555,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1572,6 +1573,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1581,5 +1582,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1604,6 +1605,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Erro"
@@ -1766,5 +1767,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Non, abortar"
@@ -2053,5 +2054,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2534,5 +2535,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2576,9 +2577,9 @@
 "Desexa desplazalos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Soltar o botón do rato para escoller os obxectos do rectángulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2587,9 +2588,9 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar o botón do rato para deter a rotación."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2872,5 +2873,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Buscar"
@@ -3075,7 +3076,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3347,5 +3348,5 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3503,31 +3504,31 @@
 msgstr "Corrección"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3546,15 +3547,15 @@
 msgstr "Valor de lonxitude ilegal valor \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Atencion:fallou ao gardar preferencia para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ficheiro de configuración mal formado nas liñas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3565,5 +3566,5 @@
 "non é un directorio."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3574,5 +3575,5 @@
 "\"{0}\" non é un directorio.<html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3583,5 +3584,5 @@
 "de preferencias desaparecido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3592,5 +3593,5 @@
 "directorio de preferencias desaparecido {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3600,5 +3601,5 @@
 "arquivo de preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3609,5 +3610,5 @@
 "preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3618,5 +3619,5 @@
 "de preferencias por defecto :{0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3628,5 +3629,5 @@
 "defecto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3637,10 +3638,10 @@
 "de preferencias ao arquivo por defecto :{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Erro: Liña \"{0}\" inesperada no arquivo de marcador \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3770,5 +3771,5 @@
 "incluido"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3845,9 +3846,9 @@
 "changesetId é {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Unha primitiva con ID = 0 non pode ser invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3857,5 +3858,5 @@
 "e a outra non."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4052,15 +4053,34 @@
 msgstr "PUWG 2000 Zone {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suíza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zona"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "sur"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Saltar ahi"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4084,9 +4104,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4131,5 +4151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "Vía férrea"
@@ -4150,5 +4170,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4403,29 +4423,29 @@
 msgstr "Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opcións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Amosar esta axuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Argumento de xeometría unix estandar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Descargar a caixa de límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4433,41 +4453,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Descargar a caixa de límites como datos gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Escoller coa busca indicada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Restablecer as preferencias ós valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Establecer a linguaxe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "opción dadas polas propiedades do sistema de Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/RUTA/Á/CARPETA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Cambiar o directorio para as configuración de todos os usuarios"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4481,9 +4501,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4493,57 +4513,66 @@
 "orde."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Asegurate de que cargas algún dato se usas --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Actualizando  Plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Instalando plugins actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Cargando extensións anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Establecendo valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Cargando extensións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Tarxetas de débito"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "A opción de configuración {0} foi eliminada porque xa non se usa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4553,9 +4582,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4569,9 +4598,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4695,23 +4725,23 @@
 msgstr "Usuario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "A capa \"{0}\" debe estar na lista de capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4811,5 +4841,5 @@
 msgstr "Prema para pechar o dialogo e abortar o borrado de obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4819,17 +4849,17 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Nível de ampliación:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "do titulo"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "ata a tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4843,25 +4873,25 @@
 "<i>zoom;x;i</i>tamén són válidas.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Dirección da tesela:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Aplicar a dirección da tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Por favor, introduza a dirección da tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "O valor actual non é unha dirección de tesela válida."
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Por favor introduza un índice de tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5290,4 +5320,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5372,4 +5403,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5386,4 +5418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5458,5 +5491,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5468,10 +5501,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ningún"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "todo"
@@ -5554,5 +5587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5564,5 +5597,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5597,17 +5630,17 @@
 msgstr "Aínda non decidido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Cargo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Introduza un papel para todos os membros da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Etiquetar as relación con "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5617,10 +5650,10 @@
 "relacións modificadas.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
@@ -5629,5 +5662,5 @@
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5635,5 +5668,5 @@
 msgstr "Valor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5642,5 +5675,5 @@
 "tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5658,5 +5691,5 @@
 "na relación.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5674,5 +5707,5 @@
 "orixinal na relación.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Aplicar este papel a todos os membros"
@@ -5829,5 +5862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5946,5 +5979,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5952,5 +5985,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5958,5 +5991,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5964,5 +5997,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5970,5 +6003,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5977,5 +6010,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5983,5 +6016,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5989,5 +6022,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5995,24 +6028,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro Activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b>obxectos agochados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> obxectos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6034,5 +6067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6058,37 +6091,37 @@
 msgstr "Información do obxecto avanzada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Introducir as coordenadas para o novo nodo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Usar grados decimais."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos indican que é o hemisferio Oeste/Sur."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Por favor escolle unha latitude válida, no rango -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Por favor introduce unha latitude no rango de -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Por favor escolle unha latitude válida, no rango -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Por favor escolle unha latitude válida no rango -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Pecha o diálogo e crea un novo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Pecha o diálogo,non crear un novo nodo"
@@ -6144,9 +6177,9 @@
 msgstr "Información da capa"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relacións"
@@ -6194,10 +6227,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Descargar membros incompletos das relacións escollidas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Descargar membros incompletos"
@@ -6217,37 +6250,37 @@
 msgstr "Abrir unha ventá de lista de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Buscar obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Facer zoom sobre a selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 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:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Chamar o editor para a relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Chamar o editor para a relación escollida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Escoller na lista de relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Escoller relación an lista de relacións."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6256,27 +6289,27 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Conseguir información detallada do estado interno dos obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Inspeccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Desacoplar o panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6285,5 +6318,5 @@
 "da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Facer click para minimizar/maximizar o contido do panel"
@@ -6571,13 +6604,13 @@
 msgstr "Nada para ampliar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "O contido de este conxunto de cambios aínda non foi descargado."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Descargar agora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Descargar o contido do conxunto de cambios"
@@ -6689,4 +6722,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6705,6 +6742,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6722,8 +6757,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6734,4 +6776,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6746,33 +6794,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6796,12 +6833,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6873,10 +6920,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6906,8 +6957,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6970,6 +7017,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7022,4 +7067,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7084,32 +7141,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7118,6 +7183,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7126,24 +7193,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7158,82 +7215,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7314,155 +7371,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nome"
@@ -7914,4 +7976,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<diferente>"
@@ -8418,17 +8481,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "incluíndo os fillos inmediatos das relacións pai"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8708,4 +8771,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8713,15 +8777,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr ""
@@ -8740,16 +8804,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "descoñecido"
@@ -9336,5 +9400,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9557,20 +9621,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr ""
@@ -10017,5 +10081,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrición: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Lonxitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto de vía"
+msgstr[1] "{0} puntos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10023,62 +10145,17 @@
 msgstr "punto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrición: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Lonxitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto de vía"
-msgstr[1] "{0} puntos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} etiqueta"
+msgstr[1] "{0} etiquetas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10088,10 +10165,10 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10102,7 +10179,7 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10110,10 +10187,10 @@
 msgstr "Descargar de OSM ó longo desta pista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10121,10 +10198,10 @@
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10132,21 +10209,21 @@
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10158,9 +10235,9 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10170,5 +10247,5 @@
 "posteriores ó fin foron omitidos ou movidos ó inicio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10178,30 +10255,30 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Usar configuración global."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Debuxar liñas entre puntos para esta capa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Non debuxar liñas entre puntos para esta capa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Escoller as opcións de liña do debuxo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10209,5 +10286,5 @@
 msgstr "Personalizar Cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10216,5 +10293,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10223,18 +10300,18 @@
 msgstr "Escolle unha cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Marca dos puntos con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de trazado con nome de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10244,23 +10321,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Ficheiros Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcas de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importar imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10693,15 +10770,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11654,4 +11731,49 @@
 msgid "Voice recorder calibration"
 msgstr "Calibración do grabador de voz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Tempo de introducción (segundos)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "O valor predeterminado é \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Ao gardar, conservar os ficheiros de copia de seguridade que rematen en ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11735,5 +11857,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Coche"
@@ -11752,16 +11874,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -11795,12 +11917,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Pé"
@@ -12067,18 +12189,18 @@
 msgstr "Por defecto (decidido automáticamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Activar os valores predeterminados incorporadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12397,26 +12519,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12532,6 +12646,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternativo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12748,13 +12871,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Conservar ficheiros de copia de seguridade"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Ao gardar, conservar os ficheiros de copia de seguridade que rematen en ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12934,5 +13048,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12941,49 +13055,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Máis información acerca desta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Atributos Opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12993,15 +13107,15 @@
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13011,17 +13125,17 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13629,5 +13743,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13734,5 +13848,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13741,5 +13855,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13812,5 +13926,5 @@
 msgstr "O arquivo \"{0}\" non existe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13820,5 +13934,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
@@ -13826,5 +13940,5 @@
 "Atopado un elemento XML <nd> o cal non é un fillo directo dun elemento <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13832,5 +13946,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13838,5 +13952,5 @@
 msgstr "Valor ilegal do atributo \"ref\" do elemento <nd>. Obtívose {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13844,5 +13958,5 @@
 msgstr "A vñia borrada {0} contén nodos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -13851,5 +13965,5 @@
 "<relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13857,5 +13971,5 @@
 msgstr "Falta o atributo \"ref\" no membro na relación {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13864,5 +13978,5 @@
 "Valor ilegal para o atributo \"ref\" no membro na relación {0}.Obtívose {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13871,5 +13985,5 @@
 "Valor ilegal para o atributo \"type\" no membro na relación {0}.Obtívose {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13880,10 +13994,10 @@
 "Obtívose {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación incompleta de elemento <member> con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13891,9 +14005,9 @@
 msgstr "A relación borrada {0} contém membros"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "Falta unha clave ou valor de atributo na etiqueta."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13902,11 +14016,11 @@
 "Elemento indefinido \"{0}\" atopado no fluxo de datos entrante. Saltando."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Obxecto ilegal con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13920,8 +14034,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13935,5 +14049,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13941,5 +14055,5 @@
 msgstr "Versión da API descoñecida ou non soportada. Obtívose {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13948,6 +14062,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13961,6 +14075,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13969,5 +14083,5 @@
 msgstr "Valor ilegal para o atributo \"changeset\".Obtñivose {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13975,5 +14089,5 @@
 msgstr "Falta un atributo requerido \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13981,13 +14095,13 @@
 msgstr "Valor numerico longo para o atributo \"{0}\". Obtívose \"{1}\"."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Vía con ID externo \"{0}\" inclúe nodos que faltan con ID externa \"{1}\""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Vía con ID externo \"{0}\" inclúe nodos que faltan con ID externa \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13995,5 +14109,5 @@
 msgstr "O nodo borrado {0} é parte da vía {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14005,5 +14119,5 @@
 "nos datos cargados."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14015,5 +14129,5 @@
 "externa \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14021,17 +14135,17 @@
 msgstr "O membro borrado {0} é usado pola relación {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Preparar os datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Procesando daros de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Preparando o conxunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14567,11 +14681,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14580,16 +14694,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14598,5 +14712,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14617,13 +14731,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Non facer nada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Informar de Fallo"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14632,9 +14746,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Excepción Inesperada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14642,5 +14756,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14648,5 +14762,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14655,5 +14769,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14661,9 +14775,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(O texto xa foi copiado ao teu portapapeis.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14860,5 +14974,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14912,5 +15026,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14924,5 +15038,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14932,5 +15046,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14941,5 +15055,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Consello: Pode editar os atallos nas preferencias.)"
@@ -15040,5 +15154,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -15124,10 +15238,61 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Horario de apertura"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Cambiar as propiedades de ata {0} obxecto"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Escoller"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Vía {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Ferramenta: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "abrir"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -15300,51 +15465,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Non se pode engadir un nodo fora do mundo."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15443,16 +15610,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15466,5 +15625,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15577,5 +15736,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Construccións"
@@ -15820,5 +15979,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16239,8 +16398,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16354,6 +16509,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr ""
@@ -17713,5 +17868,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Transporte público"
@@ -17755,49 +17910,54 @@
 msgstr "Pegadas"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "datos importados de {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "crear novo obxecto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "cambiar a selección"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un engadido que permirte que JOSM sexa controlado por outras aplicacións"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Configuración do engadido Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17806,34 +17966,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Accións permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Desexa permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Confirma a acción do Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Require detalles: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18056,58 +18216,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -18391,11 +18551,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Editar tubería"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19493,5 +19652,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19611,59 +19770,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20145,143 +20304,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "badén"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Por favor introduza un índice de tesela"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Escaleira de paso"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20301,7 +20457,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "diversos"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20395,7 +20550,6 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Escoller coa busca indicada"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20416,9 +20570,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20477,21 +20631,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20502,5 +20656,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20509,5 +20663,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20515,10 +20669,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20527,24 +20681,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20555,75 +20709,100 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Non se puido atopar o obxecto mapa."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro"
@@ -21191,11 +21370,16 @@
 "Problem)..."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Amosa unha imaxe OpenLayer de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21203,5 +21387,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21210,5 +21394,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21218,5 +21402,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21228,5 +21412,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21237,10 +21421,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "O gran JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21250,15 +21434,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Permitir outras aplicacións enviar ordes a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Complemento para desfacer conxuntos de cambios"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21272,5 +21456,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21282,10 +21466,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21297,5 +21481,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21306,10 +21490,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -21318,5 +21502,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21329,15 +21513,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificion entre medianeras a partires de bloques únicos"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21348,5 +21532,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21357,5 +21541,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21366,10 +21550,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21380,5 +21564,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21388,5 +21572,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21397,5 +21581,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21403,15 +21587,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Escolle unha secuencia de vías conectadas non ramificadas"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21422,5 +21606,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21464,4 +21648,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21494,10 +21679,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Autovías"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Rúas"
@@ -21508,5 +21693,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autoestrada"
@@ -21515,5 +21700,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Editar Autoestrada"
@@ -21550,10 +21735,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referencia"
@@ -21567,8 +21752,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Carriles"
@@ -21587,13 +21772,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Velocidade Máx.(km/h)"
@@ -21627,17 +21812,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Sentido único"
@@ -21674,17 +21859,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21718,17 +21903,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Túnel"
@@ -21759,17 +21944,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Desmonte"
@@ -21800,17 +21985,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Terraplén"
@@ -21818,5 +22003,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Enlace de autopista"
@@ -21825,5 +22010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Editar enlace de autopista"
@@ -21831,5 +22016,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Rúa principal"
@@ -21838,5 +22023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Editar rúa principal"
@@ -21846,6 +22031,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Autovía"
@@ -21853,5 +22038,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Enlace a rúa principal"
@@ -21860,5 +22045,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Editar enlace a rúa principal"
@@ -21871,5 +22056,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primaria"
@@ -21878,5 +22063,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Editar rúa primaria"
@@ -21884,10 +22069,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Enlace a rúa primaria"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Editar enlace a rúa primaria"
@@ -21899,5 +22084,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secundaria"
@@ -21907,5 +22092,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Editar rúa secundaria"
@@ -21913,5 +22098,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Rúa terciaria ou local"
@@ -21921,5 +22106,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Editar via terciaria"
@@ -21931,5 +22116,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Sen clasificar"
@@ -21939,5 +22124,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Editar carreteira sen clasificación"
@@ -21947,6 +22132,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Lugar de paso"
@@ -21969,15 +22154,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -21989,5 +22174,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Rúa urbana"
@@ -21996,5 +22181,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Editar rúa urbana"
@@ -22014,12 +22199,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Superficie"
@@ -22041,166 +22226,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "sen pavimentar"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalto"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "formigón"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "bosque"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "pavimento de pedra"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "adoquinado"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "grava"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "grijo"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "compactado"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "pavimento vexetal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "herba"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "area"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "terra"
@@ -22208,5 +22393,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Rúa residencial"
@@ -22215,5 +22400,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Editar rúa residencial"
@@ -22221,5 +22406,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Calle peatonal"
@@ -22228,5 +22413,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Editar una calle peatonal"
@@ -22234,5 +22419,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Servizo"
@@ -22241,5 +22426,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Editar vía de servicio"
@@ -22249,18 +22434,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Tipo de vía de servicio"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "callejón"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "camiño de entrada(a unha casa , graraxe, finca ...)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "corredor de aparcamento"
@@ -22268,5 +22453,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Corredor de aparcamento"
@@ -22276,10 +22461,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Editar corredor de aparcamento"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Rúa (Tipo descoñecido)"
@@ -22288,5 +22473,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Editar rúa (tipo descoñecido)"
@@ -22294,14 +22479,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Construcción"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Edtar unha vía en construcción"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Unión"
@@ -22317,5 +22502,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rotonda"
@@ -22324,5 +22509,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Restriccións de trafico"
@@ -22331,15 +22516,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Editar restriccións de tráfico"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Peaxe"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Sen saída"
@@ -22347,5 +22532,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Acceso"
@@ -22371,4 +22556,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22376,4 +22562,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22449,236 +22641,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privado"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permisivo"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "agrícola"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "forestal"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "reparto de mercancías"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "non"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Agrícola"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "autorizado"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privado"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permisivo"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "agrícola"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "forestal"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "reparto de mercancías"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "non"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Agrícola"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "autorizado"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "oficial"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículos pesados (> 6 t.)"
@@ -22693,10 +22892,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Cabalo"
@@ -22712,10 +22911,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -22730,19 +22930,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automóbil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehículos de servicio público (SP)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -22750,20 +22950,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Lonxitude max. (en metros)"
@@ -22771,5 +22971,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -22780,5 +22980,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -22798,10 +22998,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -22823,10 +23023,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -22848,10 +23048,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -22873,5 +23073,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22886,9 +23086,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "vía local"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "vía sen clasificación"
@@ -22902,9 +23102,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "rúa urbana"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "rúa residencial"
@@ -22948,10 +23148,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -22981,5 +23181,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22991,10 +23191,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Editar ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -23002,10 +23202,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Pista"
@@ -23014,35 +23214,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Editar Pista"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Tipo de pista"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "Grado 1 (pavimentada)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "Grado 2 (de áridos)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "Grado 3 (árido con vexetación entre rodaduras)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "Grado 4 (de terra con vexetación entre rodaduras)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "Grado 5 (con rodaduras apenas visibles entre a vexetación)"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Escala MTB"
@@ -23050,5 +23250,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Camiño"
@@ -23057,76 +23257,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Editar camiño"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Escala SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "senda"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "senda de montaña"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "senda de montaña esixente"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "senda alpina"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "senda alpina esixente"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "senda alpina difícil"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "excelente"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "bon"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "intermedia"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "mala"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "pésima"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Sillas de rodas"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Esquí"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Trineo"
@@ -23135,5 +23335,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Camiño de cabalos dedicado"
@@ -23141,5 +23341,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Editar vía de cabalos"
@@ -23147,5 +23347,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Carril bici dedicado"
@@ -23163,11 +23363,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Editar vía ciclable"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Peóns"
@@ -23175,5 +23375,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Carril bici e vía peatonal separadas"
@@ -23181,5 +23381,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Carril bici y vía peatonal conxuntos"
@@ -23187,5 +23387,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Acera peatonal dedicada"
@@ -23194,5 +23394,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
@@ -23200,5 +23400,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Pasos"
@@ -23208,10 +23408,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleiras"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Numero de asentos"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Saída de autopista"
@@ -23219,15 +23425,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Editar saída de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Servizos"
@@ -23235,5 +23441,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -23241,10 +23447,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23273,36 +23480,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operador/a"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "fluxo"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Editar restaurante"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Teléfono de emerxencia"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -23312,5 +23540,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -23319,27 +23547,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "illa"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "sen marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Cruce de cabalos"
@@ -23347,6 +23575,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -23355,11 +23583,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nome de cruce (Reino Unido)"
@@ -23367,30 +23595,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Deter"
@@ -23398,67 +23626,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Cruce peatonal"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Editar cruce"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Tipo de nome (Reino Unido)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Calmado de tráfico"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Editar calmado de tráfico"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "badén"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicán"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "garganta"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "coxín"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "resalte"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "táboa"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Lugar de cruces frecuentes"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Editar lugar de cruces frecuentes"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rotonda"
@@ -23469,14 +23635,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "no sentido das agullas do reloxo"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Cruce peatonal"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Editar cruce"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Tipo de nome (Reino Unido)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Calmado de tráfico"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Editar calmado de tráfico"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "badén"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicán"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "garganta"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "coxín"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "resalte"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "táboa"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Lugar de cruces frecuentes"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Editar lugar de cruces frecuentes"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -23486,5 +23714,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Límite de Cidade"
@@ -23492,15 +23720,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Editar o sinal de límite da cidade"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Rádar de tráfico"
@@ -23509,11 +23737,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Teléfono de emerxencia"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Pendente"
@@ -23521,5 +23744,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Pendente pronunciada"
@@ -23527,5 +23750,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Contedor de gravilla"
@@ -23535,10 +23758,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Vado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -23546,5 +23769,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Porto de montaña"
@@ -23552,5 +23775,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Editar porto de montaña"
@@ -23559,10 +23782,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Elevación"
@@ -23570,5 +23793,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barreiras"
@@ -23576,5 +23799,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Bolardo"
@@ -23582,5 +23805,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -23625,16 +23848,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Barreira para bicicletas"
@@ -23643,5 +23866,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Bloque"
@@ -23649,5 +23872,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Barreira canadiense"
@@ -23655,10 +23878,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Editar barreira canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -23666,15 +23889,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Picos"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Editar resorte con pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Cabina de peaxe"
@@ -23682,5 +23905,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaxe"
@@ -23688,10 +23911,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -23700,5 +23923,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Seto"
@@ -23709,22 +23932,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Valado"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "valado"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "valado de madeira"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "valado de alambre"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Parede"
@@ -23732,5 +23955,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Muralla da cidade"
@@ -23739,5 +23962,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -23748,10 +23971,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Editar unha entrada"
@@ -23759,5 +23982,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Porta"
@@ -23765,50 +23988,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Editar porta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Barreira"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Editar una barreira"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Porta de golpe (en fincas gandeiras, que se abre sin saír do vehículo)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Editar porta de golpe"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Portilla xiratoria"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla xiratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Escaleira de paso"
@@ -23816,25 +24039,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Editar una escaleira de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Torno"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Editar torno"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -23842,25 +24065,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Auga"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "fonte"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Editar fonte"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Desaugue"
@@ -23868,10 +24080,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Editar canal de desaugue"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Acequia"
@@ -23879,10 +24091,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Editar acequia"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Arroio ou riachuelo"
@@ -23890,10 +24102,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "editar arroio ou riachuelo"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Canal"
@@ -23901,10 +24113,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Río"
@@ -23914,59 +24126,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Editar un río"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "fonte"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Editar fonte"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Fervenza"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Editar unha fervenza"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Represa"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Editar unha represa"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Presa"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Editar unha presa"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Conca"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Editar cunca"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Reservorio"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Editar reservorio"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Depósito de auga"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Editar depósito de auga"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Editar auga"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Terra"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Editar terra"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Conca"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Editar cunca"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Reservorio"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Editar reservorio"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Depósito de auga"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Editar depósito de auga"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Liña de costa"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Editar liña de costa"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Ribeira"
@@ -23975,10 +24241,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Editar ribeira"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Pantano"
@@ -23989,14 +24256,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "ciénaga"
@@ -24010,35 +24277,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "xuncal"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Lama"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Editar lameira"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Praia"
@@ -24046,20 +24313,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Editar praia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Bahía"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Acantilado"
@@ -24067,145 +24334,215 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Liña de costa"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Editar liña de costa"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Compras"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Terminal de ferry"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Editar terminal de ferry"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Coche"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "novato"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicicleta"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Astillero"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Editar un astillero"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Muelle"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Editar un muelle"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Presa"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Editar unha presa"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Nodo en vía fluvial"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Porto deportivo"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Editar porto deportivo"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Embarcadoiro"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Editar embarcadoiro"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Esclusa"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Represa"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Editar unha represa"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Fervenza"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Editar unha fervenza"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Punto de xiro"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Porto deportivo"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Editar porto deportivo"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Embarcadoiro"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Editar embarcadoiro"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Terminal de ferry"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Editar terminal de ferry"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Rampa"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24215,16 +24552,38 @@
 msgstr "Editar rampa"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Astillero"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Editar un astillero"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Muelle"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Editar un muelle"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Vía de tren"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Vía de tren"
@@ -24232,5 +24591,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -24260,7 +24619,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "ancho(mm)"
@@ -24276,8 +24635,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Tipos"
@@ -24291,29 +24650,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "iarda"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "vía moerta"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Electrificado"
@@ -24326,8 +24685,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "liña_de_contacto"
@@ -24398,8 +24757,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24411,8 +24770,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltaxe"
@@ -24425,8 +24784,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frecuencia (Hz)"
@@ -24439,23 +24798,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Vía estreita"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estreita"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -24463,50 +24822,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Metro lixeiro"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Editar metro lixeiro"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Editar metro"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -24514,5 +24873,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -24521,10 +24880,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
@@ -24533,9 +24892,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Tipos opcionais"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -24544,5 +24903,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -24551,5 +24910,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -24559,5 +24918,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -24565,5 +24924,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Plataforma de xiro"
@@ -24572,5 +24931,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Tope de vía"
@@ -24579,10 +24938,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -24590,10 +24949,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -24601,10 +24960,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -24612,10 +24971,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Editar telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Góndola"
@@ -24623,10 +24982,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Editar góndola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24635,5 +24995,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24641,5 +25001,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24648,5 +25008,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24654,5 +25014,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Gasolineira"
@@ -24662,69 +25022,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Editar Gasolineira"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "terra"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indipend."
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24741,34 +25124,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24776,37 +25160,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Horario de apertura"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24827,33 +25222,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24862,170 +25259,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "Con tenda"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Tenda de alimentación"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Quiosco"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Tipos de combustible:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas a líquido - diesel ultimate)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel para Vehiculos pesados"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 octanos"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 octanos"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 octanos"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 octanos"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mezcla ao 10% de etanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mezcla ao 85% de etanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (Gas licuado do petróleo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GCN(Gas Natural Comprimido)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 misturada (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 misturada (mofa/moped)"
@@ -25033,4 +25452,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25042,6 +25462,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Aparcamento"
@@ -25050,5 +25470,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Editar aparcamento"
@@ -25059,25 +25479,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "ao aire libre"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Aparcamento disuasorio (Park & Ride)"
@@ -25086,54 +25508,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "De pago"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Capacidade (en xeral)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Prazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Espazos para a muller"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Espazos para os páis"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Ver na wiki para outra capacidade"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Limpeza"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Editar lavadoiro de vehículos"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Concesionario de automóviles"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Editar concesionario de automóviles"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Taller"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Editar taller"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Tipos"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Editar árbore"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Contido"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Alquiler"
@@ -25142,10 +25708,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Compartindo"
@@ -25153,28 +25718,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Editar aparcamiento para bicicletas"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacidade"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocicleta"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Editar Autoestrada"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Servizos"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Escala"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "mala"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Axustes prestablecidos"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Roupas"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacidade"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Tenda de bicicletas"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Editar tenda de bicicletas"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25184,5 +25808,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25190,5 +25814,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -25196,5 +25820,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Apeadeiro de ferrocarril"
@@ -25202,5 +25826,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Editar apeadeiro"
@@ -25208,5 +25832,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -25215,5 +25839,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -25221,5 +25845,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -25228,5 +25852,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -25238,5 +25862,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -25244,10 +25868,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -25256,10 +25880,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Cadeira de rodas"
@@ -25268,5 +25892,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -25275,5 +25899,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -25281,5 +25905,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -25289,13 +25913,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Refuxio"
@@ -25303,19 +25926,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Pavimento táctil"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -25323,5 +25946,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -25329,5 +25952,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -25335,10 +25958,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aeroporto"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Campo de aviación"
@@ -25346,5 +25969,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Editar campo de aviación"
@@ -25352,10 +25975,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25364,5 +25987,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Pista"
@@ -25370,5 +25993,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Editar pista"
@@ -25376,5 +25999,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Pista de rodaxe"
@@ -25382,5 +26005,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Editar pista de rodaxe"
@@ -25388,5 +26011,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Heliporto"
@@ -25394,5 +26017,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Editar heliporto"
@@ -25402,5 +26025,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Apron"
@@ -25410,5 +26033,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25419,6 +26042,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Baliza"
@@ -25428,5 +26051,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Manga de vento"
@@ -25435,5 +26058,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -25441,5 +26064,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Editar Terminal"
@@ -25447,15 +26070,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Editar Porta de Terminal"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Viaxes"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Aloxamiento"
@@ -25467,5 +26090,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25474,5 +26097,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Editar hotel"
@@ -25485,8 +26108,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Estrelas"
@@ -25510,34 +26133,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25551,168 +26174,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -25720,20 +26248,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Cabaña ou bungalow"
@@ -25741,10 +26269,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Editar cabaña ou bungalow"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Albergue"
@@ -25752,30 +26280,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -25783,10 +26312,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -25797,5 +26326,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -25803,5 +26332,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -25809,5 +26338,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cociña"
@@ -25815,79 +26346,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grego"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "rexional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "xaponés"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "francés"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Comida rápida"
@@ -25895,18 +26426,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecemento de comida rápida"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish_and_chips (patacas e pescado fritos)"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "polo"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25914,10 +26445,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Cafetería"
@@ -25925,10 +26456,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25936,20 +26472,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Editar pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -25957,10 +26493,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -25968,25 +26504,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museo"
@@ -25994,9 +26530,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -26005,9 +26541,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Parque temático"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Editar parque temático"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Gráficos"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Editar traballo artístico"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -26015,50 +26572,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Torre de vixía"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Parque temático"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Editar parque temático"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Gráficos"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Editar traballo artístico"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Editar refuxio"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Cheminea"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Zona de picnic"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Editar zona de picnic"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topográfico"
@@ -26096,5 +26654,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26102,28 +26660,28 @@
 msgstr "rúa"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "lugar"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "rexión"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -26133,5 +26691,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -26139,5 +26697,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Sendeiro"
@@ -26145,6 +26703,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -26152,5 +26710,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -26158,6 +26716,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Esquí"
@@ -26165,5 +26723,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Equitación"
@@ -26171,46 +26729,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "...outro métodos de desprazamentos posibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historial"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "vida salvaxe"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Poste identificador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26219,5 +26777,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -26225,55 +26783,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Outros Puntos de Información"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Editar refuxio"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Cheminea"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Zona de picnic"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Editar zona de picnic"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Castelo"
@@ -26282,19 +26819,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Editar castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Editar ruínas"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Lugar arqueolóxico"
@@ -26303,9 +26840,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueolóxico"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -26313,10 +26850,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Sitio paleontolóxico"
@@ -26324,5 +26861,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontolóxico"
@@ -26330,15 +26867,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -26346,55 +26883,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Cruceiro"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Editar cruceiro"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Camiño a santuario"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Editar camiño a santuario"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Perdra Histórica"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Editar Pedra histórica"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Zona de xogos"
@@ -26402,35 +26939,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Editar zona de xogos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Editar pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -26444,6 +26981,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "escoller deporte:"
@@ -26859,6 +27396,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26893,240 +27430,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "fútbol_americano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "fútbol_canadiense"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "carreira de cans"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "fútbol_gaélico"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "ximnasia"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "carreira de cabalos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "liga_rugby"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "rugby_union"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "patinaxe"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Cancha de xogo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Editar cancha de xogo"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Pista de carreiras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreiras"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Deportes"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Múltiple"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -27143,5 +27680,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27168,23 +27704,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tipo"
@@ -27201,5 +27745,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27226,211 +27769,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "cancha de xogo"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Carreiras de cans"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Editar carreiras de cans"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Carreira de cabalos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Editar carreiras de caballos"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Ximnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Editar Ximnasia"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Deportes de motor"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Editar deportes de motor"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Patinaxe"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Editar patinaxe"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -27438,52 +27984,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Dificultade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "fora da pista"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Tiro"
@@ -27491,204 +28037,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "Futbol Americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "Editar Fútbol Americano"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "Fútbol_Canadiense"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "Editar Fútbol Canadiense"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "Fútbol Gaélico"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "Editar Fútbol Gaélico"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "Liga de Rugby"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "Editar Rugby Union"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Críket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Edit críket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Críket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Editar críket con redes"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Ténis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Editar tenis de mesa"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Deportes de motor"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Editar deportes de motor"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Aviso"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Editar aparcamento"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Automóbil"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Editar deportes de motor"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Editar patinaxe"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Editar aduana"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Coche"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Editar telecabina"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Edificio"
@@ -27696,5 +28308,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Edificio público"
@@ -27702,10 +28314,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Casa do Concello"
@@ -27713,10 +28325,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Editar Casa do Concello"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Embaixada"
@@ -27724,10 +28336,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Xuzgado"
@@ -27736,10 +28348,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Editar xuzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Prisión"
@@ -27748,10 +28360,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Policía"
@@ -27761,10 +28373,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Parque de bombeiros"
@@ -27773,10 +28385,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Editar parque de bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -27784,5 +28396,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -27790,15 +28402,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Editar Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Escola"
@@ -27806,10 +28418,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Editar escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universidade"
@@ -27817,10 +28429,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Editar universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Instituto"
@@ -27828,5 +28440,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Editar instituto"
@@ -27834,5 +28446,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cine"
@@ -27841,10 +28453,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Biblioteca"
@@ -27853,9 +28465,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -27863,10 +28475,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teatro"
@@ -27875,10 +28487,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -27888,5 +28500,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -27895,6 +28507,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Relixión"
@@ -27903,66 +28515,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "cristian"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "xudía"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "musulmá"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Denominación"
@@ -27971,189 +28583,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evanxélico"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "testigos de Xenoveva"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "suní"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Enderezos"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Editar enderezos"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Número de casa"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nome da casa"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nome da rúa"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Nome da cidade"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Código postal"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Código do país"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Editar interpolación de direccións"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Esquema numérico"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "impares"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "pares"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabético"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Feito polo home"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -28161,25 +28703,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Torre de auga"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Faro"
@@ -28187,10 +28729,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Muíño de vento"
@@ -28198,10 +28740,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Editar muíño de vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Tubería"
@@ -28210,41 +28752,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "augas residuais"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "calquer substancia"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "sumerxido"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "na superficie"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -28254,10 +28796,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Grúa"
@@ -28265,5 +28807,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -28271,10 +28813,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Vértice xeodésico"
@@ -28282,10 +28824,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Editar vértice xeodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Cámara de vixilancia"
@@ -28293,23 +28835,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vixilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Xerador de enerxía"
@@ -28319,35 +28861,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Editar Xerador de Enerxía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "vento"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -28356,10 +28898,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -28368,5 +28910,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -28374,10 +28916,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Liña de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Torre de electricidade"
@@ -28388,23 +28930,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidade"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Referencia da torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -28413,20 +28955,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Tipo de liña"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28434,55 +28976,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Cantidade de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de arames (mellor:conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "sinxelo"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "dobre"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "cuadruple"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Servizos"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Buzón de Correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Teléfono"
@@ -28491,5 +29033,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -28497,5 +29039,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Moedas"
@@ -28503,5 +29045,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Anotacións"
@@ -28509,5 +29051,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Tarxeta de recarga e moedeitos electrónicos"
@@ -28515,5 +29057,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Tarxetas de débito"
@@ -28521,15 +29063,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Tarxetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Tarxetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Reciclaxe"
@@ -28538,5 +29080,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Editar punto limpo"
@@ -28544,35 +29086,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Latas"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Roupas"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Papeleiras"
@@ -28580,5 +29117,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Editar papeleiras"
@@ -28587,31 +29124,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "pedra"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marrón"
@@ -28690,5 +29227,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28698,31 +29235,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "vermello"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Numero de asentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Apostadeiro de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadeiro de caza"
@@ -28730,31 +29267,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Alto"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Agochar"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fonte"
@@ -28763,10 +29300,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Editar fonte"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Auga potable"
@@ -28775,10 +29312,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Editar auga potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -28787,5 +29324,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -28793,501 +29330,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Pé"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermercado"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Editar supermercado"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Tenda de alimentación"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Editar tenda de alimentación"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Quiosco"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Editar quiosco"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Carnicería"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Editar carnicería"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Panadeiro"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Editar panadeiro"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Orgánico"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Editar tenda de productos orgánicos"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Tenda de bebidas alcohólicas"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Editar tenda de bebidas alcohólicas"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Brebaxes"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Editar tenda de brebaxes"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Tendas"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Farmacia"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Editar farmacia"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Perruqueria"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Editar perruquería"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Óptica"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Editar óptica"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Editar tenda de ordenadores"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Zapatos"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Editar zapatería"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Exteriores"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Editar tenda de exteriores"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Editar tenda de materiais deportivos"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Tintorería"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Editar tintorería"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Lavandería"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Editar Lavandería"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "paso con mais dun cruce ferroviario"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Ediar vía de tren"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Ordenador"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Editar tenda de ordenadores"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Electrónica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Editar tenda de electrónica"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Editar tenda HIfi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Vídeo"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Editar tenda de vídeos"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Floristería"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Editar floristería"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Centro de xardinería"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Editar centro de xardinería"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Ferretería"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Editar ferretería"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Almacén de bricolaxe"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Editar almacén de bricolaxe"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Mobles"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Editar Moblería"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Papelería"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Editar papelería"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Librería"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Editar librería"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Axencia de viaxes"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Editar axencia de viaxes"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Xoguetes"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Editar Xoguetería"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Máquina expendedora"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Editar máquina expendedora"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Expendedor automático de productos"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "Billetes de transporte público"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "Bonos de transporte público"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "Tickets de aparcamento"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "Alimentación"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "Bebidas"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "doces"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "Estanco"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "Fotos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "comida para animais"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "Xornáis"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "xoguetes"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "selos"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "Tarxetas SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "Tarxetas telefónicas"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "Bonos"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "tubo_de_bicicleta"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "gomas do pito"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampóns"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "Bolsas para excrementos"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Tarxetas de afidelización ou de desconto"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Cartos en efectivo"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banco"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Editar banco"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Caixeiro automático"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Cambio de moeda"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Editar cambio de moeda"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Editar Caixeiro"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Saúde"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Médicos"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Editar médicos"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dentista"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Editar dentista"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Farmacia"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Editar farmacia"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Expende baixo receta médica"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hospital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Editar hospital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Caixa temperada"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Editar caixa temperada"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Tendas"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Concesionario de automóviles"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Editar concesionario de automóviles"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Tenda de bicicletas"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Editar tenda de bicicletas"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermercado"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Editar supermercado"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Farmacia"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Editar farmacia"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Tenda de alimentación"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Editar tenda de alimentación"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Quiosco"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Editar quiosco"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Librería"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Editar librería"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Axencia de viaxes"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Editar axencia de viaxes"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Carnicería"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Editar carnicería"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Panadeiro"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Editar panadeiro"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Floristería"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Editar floristería"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Orgánico"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Editar tenda de productos orgánicos"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Tenda de bebidas alcohólicas"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Editar tenda de bebidas alcohólicas"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Brebaxes"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Editar tenda de brebaxes"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Ordenador"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Editar tenda de ordenadores"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Electrónica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Editar tenda de electrónica"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Editar tenda HIfi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Mobles"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Editar Moblería"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Centro de xardinería"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Editar centro de xardinería"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Ferretería"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Editar ferretería"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Almacén de bricolaxe"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Editar almacén de bricolaxe"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Papelería"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Editar papelería"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Perruqueria"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Editar perruquería"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Zapatos"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Editar zapatería"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Xoguetes"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Editar Xoguetería"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Vídeo"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Editar tenda de vídeos"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Tintorería"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Editar tintorería"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Lavandería"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Editar Lavandería"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Exteriores"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Editar tenda de exteriores"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Editar tenda de materiais deportivos"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Óptica"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Editar óptica"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Máquina expendedora"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Editar máquina expendedora"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Expendedor automático de productos"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "Billetes de transporte público"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "Bonos de transporte público"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "Tickets de aparcamento"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "Alimentación"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "Bebidas"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "doces"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "Estanco"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "Fotos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "comida para animais"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "Xornáis"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "xoguetes"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "selos"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "Tarxetas SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "Tarxetas telefónicas"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "Bonos"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "tubo_de_bicicleta"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "gomas do pito"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampóns"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "Bolsas para excrementos"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Tarxetas de afidelización ou de desconto"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Cartos en efectivo"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banco"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Editar banco"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Caixeiro automático"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Cambio de moeda"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Editar cambio de moeda"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Editar Caixeiro"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Saúde"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Médicos"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Editar médicos"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dentista"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Editar dentista"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Farmacia"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Editar farmacia"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Expende baixo receta médica"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hospital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Editar hospital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emerxencias"
@@ -29296,5 +29835,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emerxencias"
@@ -29303,15 +29842,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Número do punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Nome do Punto"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -29319,5 +29858,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -29326,368 +29865,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Xeografía"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Fronteiras"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nacional"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Editar fronteira nacional"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrativo"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Editar fronteira administrativa"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Editar fronteira civil"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Política"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Editar fronteira política"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parque Nacional"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Editar límites do parque nacional"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Lugares"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continente"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Editar continente"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "País"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Editar país"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Estado"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Editar estado"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Rexión"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Editar rexión"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "País"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Editar país"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Cidade"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Editar cidade"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Vila"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Editar Vila"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Suburbio"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Editar suburbio"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Poboación"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Editar poboación"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Aldea"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Editar aldea"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Localidade"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Pico"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Editar pico"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glaciar"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Editar glaciar"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Volcán"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Editar volcán"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Entrada de cova"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Editar entrada de cova"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Illa"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Editar Illa"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Illote"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Editar Illote"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natureza"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Árbore"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Editar árbore"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Nome botánico"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Madeira"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Editar bosque"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "conífera"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "decíduos"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "mixto"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Monte"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Editar zona forestal"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Reserva Natural"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Editar Reserva Natural"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Entrada de cova"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Editar entrada de cova"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Pico"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Editar pico"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glaciar"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Editar glaciar"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Volcán"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Editar volcán"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Fronteiras"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nacional"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Editar fronteira nacional"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrativo"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Editar fronteira administrativa"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Editar fronteira civil"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Política"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Editar fronteira política"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parque Nacional"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Editar límites do parque nacional"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Cantos"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Editar cantos"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Caída"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Editar Caída"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Matorral"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Editar matorral"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Brezal o landa"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Editar brezal o landa"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Uso do chan"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Árbore"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Editar árbore"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Nome botánico"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Madeira"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Editar bosque"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "conífera"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "decíduos"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "mixto"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Monte"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Editar zona forestal"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Reserva Natural"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Editar Reserva Natural"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Cantos"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Editar cantos"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Matorral"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Editar matorral"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Caída"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Editar Caída"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Brezal o landa"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Editar brezal o landa"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -29696,45 +30241,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Terra de labor"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Editar o uso da terra de labor"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Editar o uso do prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Editar o uso do viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Área cultivábel"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "eitar o uso da área cultivábel"
@@ -29742,25 +30287,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Xardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Editar Xardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Herba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Editar o uso ta área de herba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Parque Municipal"
@@ -29768,10 +30313,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Común"
@@ -29779,20 +30324,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Editar común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Terra de recreo"
@@ -29800,5 +30345,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar o uso da área de recreo"
@@ -29806,15 +30351,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Editar o uso da área residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Camposanto (para os cementerios próximos ás igrexas)"
@@ -29822,9 +30367,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cemiterio"
@@ -29832,39 +30377,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Editar a área do cemiterio"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Editar o uso da área comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Editar o uso da área industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Via do tren"
@@ -29872,15 +30417,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Editar o uso da área da via do tren"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Editar o uso da área militar"
@@ -29888,52 +30433,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Área de construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Editar o uso da área en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Zona industrial abandoada"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno abandoado"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Zona verde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Editar zona verde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Vertedoiro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedoiro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Canteira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Editar o uso da área da canteira"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Estación"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Enderezos"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Editar enderezos"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Número de casa"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nome da casa"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nome da rúa"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Nome da cidade"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Código postal"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Código do país"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Editar interpolación de direccións"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Esquema numérico"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "impares"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "pares"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabético"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Contido"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Engadir información do autor"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Imaxe"
 
 #. item "Relations/Multipolygon"
@@ -29941,5 +30619,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -29951,5 +30629,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -29957,5 +30635,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "segmento interior"
@@ -29963,5 +30641,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Límite"
@@ -29972,5 +30650,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Editar límite"
@@ -29978,36 +30656,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Tipo de límite"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administrativo"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "nacional"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "civil"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "político"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Subárea"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Centro de Administración"
@@ -30015,5 +30693,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Restricción de xiro"
@@ -30022,5 +30700,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Editar as restriccións de xiro"
@@ -30028,34 +30706,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "non_xirar_esquerda"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "non_xirar_dereita"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "non_seguir_de_frente"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "prohibido xiro en U"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "só_xirar_dereita"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "só_xirar_esquerda"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "só_seguir_de_frente"
@@ -30064,15 +30742,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "da vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "a través de nodo ou vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "á via"
@@ -30080,5 +30758,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Ruta"
@@ -30087,5 +30765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -30093,132 +30771,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Tipo de Ruta"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicicleta"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "camiño"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -30286,5 +30853,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30294,9 +30861,9 @@
 msgstr "pé"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "desvío"
@@ -30310,10 +30877,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Descición de símbolo"
@@ -30321,31 +30888,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "conexión"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -30354,30 +30921,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "segmento da ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "segmento seguinte"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -34355,7 +34922,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34477,8 +35043,14 @@
 msgstr "Sicilia - Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Conservar ficheiros de copia de seguridade"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Nodo en vía fluvial"
 
 #~ msgid "Be sure to include the following information:"
@@ -34612,7 +35184,4 @@
 #~ msgid "Sync clock"
 #~ msgstr "Sincronizar reloxo"
-
-#~ msgid "Image"
-#~ msgstr "Imaxe"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 22859)
+++ applications/editors/josm/i18n/po/he.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-14 00:01+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 01:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:13+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "אזהרה"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java ב OpenStreetMap עורך"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -275,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -298,5 +298,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -405,4 +405,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1037,5 +1038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1044,5 +1045,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "כתובת"
@@ -1435,13 +1436,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1450,5 +1451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1456,9 +1457,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1466,5 +1467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1498,8 +1499,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1508,9 +1509,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1526,6 +1527,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1535,5 +1536,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1558,6 +1559,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "שגיאה"
@@ -1717,5 +1718,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr ""
@@ -1985,5 +1986,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2450,5 +2451,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2489,9 +2490,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2499,9 +2500,9 @@
 "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "שחרר את סמן העכבר להפסקת ההטייה"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2761,5 +2762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "חפש"
@@ -2952,7 +2953,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3216,5 +3217,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3368,31 +3369,31 @@
 msgstr "תיקון תוויות אוטומטי"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3411,15 +3412,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "קובץ תצורה לא תקין בשורות {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3428,5 +3429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3435,5 +3436,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3442,5 +3443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3449,5 +3450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3455,5 +3456,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3462,5 +3463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3469,5 +3470,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3476,5 +3477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3483,10 +3484,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3606,5 +3607,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3676,9 +3677,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3686,5 +3687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3874,14 +3875,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "דרום"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "קפוץ לשם"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3906,9 +3926,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3951,5 +3971,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -3970,5 +3990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4223,69 +4243,69 @@
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4295,9 +4315,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4305,57 +4325,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "מאתחל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "יוצר ממשקי גרפי ראשי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "אי"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4365,9 +4394,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4381,9 +4410,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4505,23 +4535,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "השכבה אינה ברשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4612,5 +4642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4618,17 +4648,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4638,25 +4668,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5059,4 +5089,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5139,4 +5170,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5153,4 +5185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5224,5 +5257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5234,10 +5267,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "כלום"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "הכל"
@@ -5319,5 +5352,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5329,5 +5362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5362,17 +5395,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5380,15 +5413,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5396,10 +5429,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5411,5 +5444,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5421,5 +5454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5562,5 +5595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5673,5 +5706,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5679,5 +5712,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5685,5 +5718,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5691,5 +5724,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5697,5 +5730,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5704,5 +5737,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5710,5 +5743,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5716,5 +5749,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5722,24 +5755,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5760,5 +5793,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5783,37 +5816,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "הכנס את הקורדינטות של הנקודה החדשה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "השתמש במעלות עשרוניות."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "ערכים שליליים מציינים חצי כדור מערבי\\דרומי."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5869,9 +5902,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "יחסים"
@@ -5919,10 +5952,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5942,37 +5975,37 @@
 msgstr "פתח חלון רשימת בחירה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "התאם מיקוד לבחירה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "התאם מיקוד לאלמנט\\ים הבחור\\ים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5981,32 +6014,32 @@
 msgstr "בחירה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "בחירה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "\"שחרר\" את הפאנל"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל"
@@ -6283,13 +6316,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6401,4 +6434,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6417,6 +6454,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6434,8 +6469,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6446,4 +6488,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6458,33 +6506,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6508,12 +6545,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6585,10 +6632,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6618,8 +6669,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6682,6 +6729,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6734,4 +6779,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6796,32 +6853,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6830,6 +6895,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6838,24 +6905,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6870,82 +6927,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7026,155 +7083,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "שם"
@@ -7598,4 +7660,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<שונה>"
@@ -8100,17 +8163,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8386,4 +8449,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8391,15 +8455,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "סוג"
@@ -8418,16 +8482,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "לא ידוע"
@@ -8992,5 +9056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9213,20 +9277,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "שכבה"
@@ -9673,5 +9737,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "שם: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "תיאור: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "תיאור"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "אורך: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "נקודת דרך {0}"
+msgstr[1] "{0} נקודות דרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9679,62 +9801,17 @@
 msgstr "נקודת gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "שם: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "תיאור: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] ""
 msgstr[1] ""
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "תיאור"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "אורך: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "נקודת דרך {0}"
-msgstr[1] "{0} נקודות דרך"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9744,10 +9821,10 @@
 "מסלולים, ראה כאן:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9758,7 +9835,7 @@
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9766,10 +9843,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9777,10 +9854,10 @@
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9788,21 +9865,21 @@
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9814,9 +9891,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9824,5 +9901,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9832,30 +9909,30 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "השתמש בהגדרות הגלובליות."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "צייר קווים בין נקודות בשכבה זו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "אל תצייר קווים בין נקודות בשכבה זו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "בחר אפשרויות ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9863,5 +9940,5 @@
 msgstr "התאם צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9870,5 +9947,5 @@
 msgstr "ברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9877,18 +9954,18 @@
 msgstr "בחר צבע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "סמנים מנקודות בעלות שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "ייבא שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9898,23 +9975,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "קובץ שמע (wav.*)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "סמן שמע מ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "ייבא תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10351,15 +10428,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "ללא תמונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "טוען {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11294,4 +11371,47 @@
 msgstr "כיול רשם קול"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "ערך ברירת המחדל הוא \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "בזמן שמירה, שמור קובצי גיבוי המסתיימים ב ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11374,5 +11494,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "רכב"
@@ -11391,16 +11511,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "אופניים"
@@ -11434,12 +11554,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "רגל"
@@ -11685,18 +11805,18 @@
 msgstr "ברירת מחדל (נקבע אוטומטית)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "אפשר ברירות מחדל מובנות"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12011,26 +12131,18 @@
 msgstr "לא ניתן להפעיל היטל {0}. משתמש במרקטור"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12146,6 +12258,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+msgid "Internal style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12362,12 +12482,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "שמור קובצי גיבוי"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "בזמן שמירה, שמור קובצי גיבוי המסתיימים ב ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12547,5 +12659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12554,49 +12666,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "עוד מידע על הכלי הזה"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "מאפייני רשות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12606,15 +12718,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12624,17 +12736,17 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13240,5 +13352,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13336,5 +13448,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13343,5 +13455,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13410,5 +13522,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13418,10 +13530,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13429,5 +13541,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13435,5 +13547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13441,10 +13553,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13452,5 +13564,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13458,5 +13570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13464,5 +13576,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13471,10 +13583,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13482,9 +13594,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13492,11 +13604,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "עצם לא חוקי עם id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13508,8 +13620,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13523,5 +13635,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13529,5 +13641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13536,6 +13648,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13547,6 +13659,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13555,5 +13667,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13561,5 +13673,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13567,12 +13679,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13580,5 +13692,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13588,5 +13700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13596,5 +13708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13602,17 +13714,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14108,11 +14220,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14121,16 +14233,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14139,5 +14251,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14158,13 +14270,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "אל תעשה כלום"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "דווח על תקלה"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14173,9 +14285,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "שגיאה בלתי צפויה"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14183,5 +14295,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14189,5 +14301,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14196,5 +14308,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14202,9 +14314,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(הטקסט כבר הועתק ל-clipboard שלך)."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14398,5 +14510,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14449,5 +14561,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14460,5 +14572,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14468,5 +14580,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14477,5 +14589,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(טיפ: ניתן לערוך את הקיצורים ב\"מאפיינים\")"
@@ -14576,5 +14688,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14660,10 +14772,61 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "שעות פתיחה"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "שנה תכונות של עד עצם {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "בחר"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "מפה: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "כלי: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "מהירות"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -14835,51 +14998,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "לא ניתן להוסיף צומת מחוץ לעולם"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14978,16 +15143,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15001,5 +15158,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15112,5 +15269,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "מבנים"
@@ -15347,5 +15504,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15760,8 +15917,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15875,6 +16028,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "שכבה ריקה"
@@ -17230,5 +17383,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "תחבורה ציבורית"
@@ -17272,48 +17425,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "ציון דרך"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "טען נתונים מ API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "נתונים ביובאים מ-{0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "שנה את הבחירה"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "שנה נקודת מבט"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "אשר את כל פעולות השלט רחוק ידנית"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "כיוונונים לתוסף \"שלט רחוק\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17324,34 +17482,34 @@
 "לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "פעולות מורשות"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "האם אתה רוצה לאשר את זה?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "אשר פעולת שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "בקש פרטים: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17574,58 +17732,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "טען משטח"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "טען את כל המשטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "הגדל"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "הקטן"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "מיקוד אוטומטי"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "טען משטחים אוטומטית"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17909,11 +18067,10 @@
 msgstr "מדרג"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "ערוך צינור"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -18992,5 +19149,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19110,59 +19267,59 @@
 msgstr "דרכים חופפות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19643,142 +19800,140 @@
 msgstr "{0},..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "למעלה"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "הזן שם משתמש"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19891,12 +20046,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "בחר עם החיפוש הנתון"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "ציון דרך"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -19913,9 +20066,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "אירעה שגיאה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -19974,21 +20127,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -19999,5 +20152,5 @@
 msgstr "הורד משטח WMS מ-{0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20006,5 +20159,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20012,10 +20165,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20024,24 +20177,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20052,75 +20205,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "הורדה אוטומטית"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
@@ -20189,8 +20366,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20682,16 +20858,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20699,5 +20880,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20705,5 +20886,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20712,5 +20893,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20719,10 +20900,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20730,15 +20911,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20748,5 +20929,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20755,10 +20936,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20767,5 +20948,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20774,15 +20955,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20792,15 +20973,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20809,5 +20990,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20816,5 +20997,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20823,10 +21004,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20835,5 +21016,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20843,5 +21024,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20850,20 +21031,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20872,5 +21053,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20912,4 +21093,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20942,10 +21124,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "רחובות"
@@ -20956,5 +21138,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "כבישים"
@@ -20963,5 +21145,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr ""
@@ -20998,10 +21180,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "התייחסות"
@@ -21015,8 +21197,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "מסלולים"
@@ -21035,13 +21217,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "מהירות מירבית (קמ\"ש)"
@@ -21075,17 +21257,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "חד סטרי"
@@ -21122,17 +21304,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21166,17 +21348,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "מנהרה"
@@ -21207,17 +21389,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr ""
@@ -21248,17 +21430,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr ""
@@ -21266,5 +21448,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr ""
@@ -21273,5 +21455,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr ""
@@ -21279,5 +21461,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr ""
@@ -21286,5 +21468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr ""
@@ -21294,6 +21476,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21301,5 +21483,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr ""
@@ -21308,5 +21490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr ""
@@ -21319,5 +21501,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "ראשי"
@@ -21326,5 +21508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr ""
@@ -21332,10 +21514,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr ""
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -21347,5 +21529,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "משני"
@@ -21355,5 +21537,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr ""
@@ -21361,5 +21543,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr ""
@@ -21369,5 +21551,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -21379,5 +21561,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "לא מסווג"
@@ -21387,5 +21569,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "ערוך כביש לא מסווג"
@@ -21395,6 +21577,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21417,15 +21599,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21437,5 +21619,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "מגורים"
@@ -21444,5 +21626,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "ערוך רחוב מגורים"
@@ -21462,12 +21644,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "שטח פנים"
@@ -21489,166 +21671,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "סלול"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "לא סלול"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "אבני ריצוף"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "חצץ"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "דשא"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "חול"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "אדמה"
@@ -21656,5 +21838,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -21663,5 +21845,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -21669,5 +21851,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "הולכי רגל"
@@ -21676,5 +21858,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "ערוך רחוב להולכי רגל"
@@ -21682,5 +21864,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "שירות"
@@ -21689,5 +21871,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "ערוך דרך שירות"
@@ -21697,18 +21879,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21716,5 +21898,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "מפרץ חנייה"
@@ -21724,10 +21906,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "ערוך מפרץ חנייה"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "כביש (סוג לא ידוע)"
@@ -21736,5 +21918,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "ערוך כביש מסוג לא ידוע"
@@ -21742,14 +21924,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "בנייה"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "ערוך דרך מהירה בבנייה"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "צומת"
@@ -21765,5 +21947,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "כיכר"
@@ -21772,5 +21954,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "הגבלות דרך"
@@ -21779,15 +21961,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "ערוך הגבלות דרך"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "אגרה"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "דרך ללא מוצא"
@@ -21795,5 +21977,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "גישה"
@@ -21819,4 +22001,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21824,4 +22007,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21897,236 +22086,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "פרטי"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "חקלאי"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "לא"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "כן"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "פרטי"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "יעד"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "חקלאי"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "לא"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22141,10 +22337,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "סוס"
@@ -22160,10 +22356,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "אופנוע"
@@ -22178,19 +22375,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "רכב ציבורי"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "מהירות מינימלית (קמ\"ש)"
@@ -22198,20 +22395,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "משקל מירבי (טונות)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22219,5 +22416,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "כיכר"
@@ -22228,5 +22425,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "ערוך צומת"
@@ -22246,10 +22443,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -22271,10 +22468,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22296,10 +22493,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "ראשי"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22321,5 +22518,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22334,9 +22531,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "שלישוני"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr ""
@@ -22350,9 +22547,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "מגורים"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr ""
@@ -22396,10 +22593,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "שירות"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22429,5 +22626,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22439,10 +22636,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "ערוך גשר"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr ""
@@ -22450,10 +22647,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "דרכים"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22462,35 +22659,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22498,5 +22695,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "נתיב"
@@ -22505,76 +22702,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "ערוך נתיב"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "סקי"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "רכב שלג"
@@ -22583,5 +22780,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22589,5 +22786,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -22595,5 +22792,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22611,11 +22808,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "ערוך שביל אופניים"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22623,5 +22820,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22629,5 +22826,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22635,5 +22832,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22642,5 +22839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "ערוך שביל להולכי רגל"
@@ -22648,5 +22845,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "מדרגות"
@@ -22656,10 +22853,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "ערוך גרם מדרגות"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr ""
@@ -22667,15 +22869,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "מספר"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "שירותים"
@@ -22683,5 +22885,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "ערוך תחנת שירות"
@@ -22689,10 +22891,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22721,36 +22924,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "מפעיל"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "זרם"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "ערוך נחל"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "טלפון חירום"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "רמזור"
@@ -22760,5 +22984,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "סוג מעבר חציה"
@@ -22767,27 +22991,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "אי"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22795,6 +23019,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22803,11 +23027,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22815,30 +23039,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "זברה"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "שקנאי"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "עצור"
@@ -22846,67 +23070,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "מעבר חציה"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr ""
@@ -22917,14 +23079,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "מעבר חציה"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr ""
@@ -22934,5 +23158,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "תחום עיר"
@@ -22940,15 +23164,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "ערוך שלט תחום עיר"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "שם שני"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "מצלמת מהירות"
@@ -22957,11 +23181,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "טלפון חירום"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22969,5 +23188,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -22975,5 +23194,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -22983,10 +23202,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "אזור צליחה"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "ערוך אזור צליחה"
@@ -22994,5 +23213,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "מעבר הרים"
@@ -23000,5 +23219,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "ערוך מעבר הרים"
@@ -23007,10 +23226,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "הגבהה"
@@ -23018,5 +23237,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "מחסומים"
@@ -23024,5 +23243,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23030,5 +23249,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23073,16 +23292,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "תנועה מותרת:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23091,5 +23310,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "מחסום"
@@ -23097,5 +23316,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23103,10 +23322,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23114,15 +23333,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "דוקרנים"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "ערוך דוקרנים"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "תא אגרה"
@@ -23130,5 +23349,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "ערוך תא אגרה"
@@ -23136,10 +23355,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "ביקורת גבולות"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "ערוך ביקורת גבולות"
@@ -23148,5 +23367,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr ""
@@ -23157,22 +23376,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "חומה"
@@ -23180,5 +23399,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "חומת עיר"
@@ -23187,5 +23406,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23196,10 +23415,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "כניסה"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "ערוך כניסה"
@@ -23207,5 +23426,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "שער"
@@ -23213,50 +23432,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "ערוך שער"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23264,25 +23483,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23290,25 +23509,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "מים"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "מעיין"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "ערוך מעיין"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr ""
@@ -23316,10 +23524,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23327,10 +23535,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "נחל"
@@ -23338,10 +23546,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "ערוך נחל"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "תעלה"
@@ -23349,10 +23557,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "ערוך תעלה"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "נהר"
@@ -23362,59 +23570,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "ערוך נהר"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "מעיין"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "ערוך מעיין"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr ""
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr ""
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr ""
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr ""
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr ""
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr ""
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "ערוך מים"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "אדמה"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "ערוך אדמה"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr ""
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "קו חוף"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "ערוך קו חוף"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "גדת נחל"
@@ -23423,10 +23685,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "ערוך גדת נחל"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr ""
@@ -23437,14 +23700,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "אדמה בוצית"
@@ -23458,35 +23721,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "מצע קנה-סוף"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "ביצה מלוחה"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "מנגרוב"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "בוץ"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "ערוך בוץ"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "חוף"
@@ -23494,20 +23757,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "ערוך חוף"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "מפרץ"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "ערוך מפרץ"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "צוק"
@@ -23515,145 +23778,215 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "ערוך צוק"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "קו חוף"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "ערוך קו חוף"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "קניות"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "רכב"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "מתחילים"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "אופניים"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "נתיב מעבורת"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "ערוך מעבורת"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "מספנה"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "ערוך מספנה"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr ""
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr ""
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr ""
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr ""
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr ""
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr ""
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr ""
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr ""
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr ""
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr ""
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr ""
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23663,16 +23996,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "מספנה"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "ערוך מספנה"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr ""
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr ""
@@ -23680,5 +24035,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr ""
@@ -23708,7 +24063,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23724,8 +24079,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23739,29 +24094,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23774,8 +24129,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23846,8 +24201,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23859,8 +24214,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr ""
@@ -23873,8 +24228,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23887,23 +24242,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr ""
@@ -23911,50 +24266,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "רכבת קלה"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "ערוך רכבת קלה"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "רכבת תחתית"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "ערוך רכבת תחתית"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -23962,5 +24317,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23969,10 +24324,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr ""
@@ -23981,9 +24336,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr ""
@@ -23992,5 +24347,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -23999,5 +24354,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -24007,5 +24362,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -24013,5 +24368,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr ""
@@ -24020,5 +24375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24027,10 +24382,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr ""
@@ -24038,10 +24393,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24049,10 +24404,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr ""
@@ -24060,10 +24415,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24071,10 +24426,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24083,5 +24439,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24089,5 +24445,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24096,5 +24452,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24102,5 +24458,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "דלק"
@@ -24110,69 +24466,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "ערוך דלק"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "אדמה"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24189,34 +24567,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24224,37 +24603,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24275,33 +24665,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24310,170 +24702,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "חנות"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "מכולת"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "קיוסק"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24481,4 +24895,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24490,6 +24905,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "חניה"
@@ -24498,5 +24913,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr ""
@@ -24507,25 +24922,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24534,54 +24951,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "שטיפה"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "ערוך שטיפת רכב"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "ערוך חנות רכב"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "תיקונים"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "ערוך תיקוני רכבים"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "כן"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "ערוך עץ"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "צור קשר עם {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "מספר טלפון"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "השכרה"
@@ -24590,10 +25151,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "ערוך השכרת רכב"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "שיתוף"
@@ -24601,28 +25161,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "ערוך שיתוף רכבים"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "ערוך מירוץ סוסים"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr ""
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "אופנוע"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "אופנוע"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "שירותים"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "שמירה"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "אדמה"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "נתיב"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr ""
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr ""
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr ""
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "ערוך חנות אופניים"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "ערוך השכרת אופניים"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24632,5 +25251,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24638,5 +25257,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24644,5 +25263,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -24650,5 +25269,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -24656,5 +25275,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr ""
@@ -24663,5 +25282,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr ""
@@ -24669,5 +25288,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr ""
@@ -24676,5 +25295,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr ""
@@ -24686,5 +25305,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24692,10 +25311,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "כניסת רכבת תחתית"
@@ -24704,10 +25323,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "ערוך כניסת רכבת תחתית"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr ""
@@ -24716,5 +25335,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "תחנת אוטובוס"
@@ -24723,5 +25342,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "ערוך תחנת אוטובוס"
@@ -24729,5 +25348,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr ""
@@ -24737,13 +25356,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr ""
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "מקלט"
@@ -24751,19 +25369,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "ספסל"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -24771,5 +25389,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "מונית"
@@ -24777,5 +25395,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "ערוך תחנת מוניות"
@@ -24783,10 +25401,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "שדה תעופה"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24794,5 +25412,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24800,10 +25418,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr ""
@@ -24812,5 +25430,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24818,5 +25436,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24824,5 +25442,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24830,5 +25448,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24836,5 +25454,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24842,5 +25460,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24850,5 +25468,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24858,5 +25476,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24867,6 +25485,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr ""
@@ -24876,5 +25494,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24883,5 +25501,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24889,5 +25507,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24895,15 +25513,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "לינה"
@@ -24915,5 +25533,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "מלון"
@@ -24922,5 +25540,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr ""
@@ -24933,8 +25551,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr ""
@@ -24958,34 +25576,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -24999,168 +25617,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "מסוף"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "מספר טלפון"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr ""
@@ -25168,20 +25691,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr ""
@@ -25189,10 +25712,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr ""
@@ -25200,30 +25723,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr ""
@@ -25231,10 +25755,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -25245,5 +25769,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -25251,5 +25775,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr ""
@@ -25257,5 +25781,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr ""
@@ -25263,79 +25789,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -25343,18 +25869,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25362,10 +25888,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "בית קפה"
@@ -25373,10 +25899,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "פאב"
@@ -25384,20 +25915,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "בר"
@@ -25405,10 +25936,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -25416,25 +25947,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "מוזיאון"
@@ -25442,9 +25973,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "גן חיות"
@@ -25453,9 +25984,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "פארק שעשועים"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "ערוך פארק שעשועים"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "יצירת אומנות"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "ערוך יצירת אומנות"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -25463,50 +26015,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "פארק שעשועים"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "ערוך פארק שעשועים"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "יצירת אומנות"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "ערוך יצירת אומנות"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "ערוך מקלט"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr ""
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "אתר פיקניק"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "ערוך אתר פיקניק"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25544,5 +26097,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25550,28 +26103,28 @@
 msgstr "רחוב"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25581,5 +26134,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25587,5 +26140,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "צעידה"
@@ -25593,6 +26146,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "רכיבה"
@@ -25600,5 +26153,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25606,6 +26159,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "סקי"
@@ -25613,5 +26166,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25619,46 +26172,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25667,5 +26220,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25673,55 +26226,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "ערוך מקלט"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr ""
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "אתר פיקניק"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "ערוך אתר פיקניק"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "טירה"
@@ -25730,19 +26262,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -25751,9 +26283,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -25761,10 +26293,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25772,5 +26304,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25778,15 +26310,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -25794,55 +26326,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -25850,35 +26382,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "דייג"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -25892,6 +26424,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -26307,6 +26839,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26341,240 +26873,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26591,5 +27123,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26616,23 +27147,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "סוג"
@@ -26649,5 +27188,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26674,211 +27212,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "קשתות"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "ספורט מוטורי"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "ערוך ספורט מוטורי"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -26886,52 +27427,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "ירי"
@@ -26939,204 +27480,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "גולף"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "טניס"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "ספורט מוטורי"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "ערוך ספורט מוטורי"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "אזהרה"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "ערוך מעיין"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "ספורט מוטורי"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "ערוך ספורט מוטורי"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "ערוך ניקוי יבש"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "ערוך ביקורת גבולות"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "רכב"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "ערוך בר"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "מבנה"
@@ -27144,5 +27751,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -27150,10 +27757,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -27161,10 +27768,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "שגרירות"
@@ -27172,10 +27779,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -27184,10 +27791,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "כלא"
@@ -27196,10 +27803,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "משטרה"
@@ -27209,10 +27816,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -27221,10 +27828,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "דואר"
@@ -27232,5 +27839,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -27238,15 +27845,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "בית ספר"
@@ -27254,10 +27861,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "אוניברסיטה"
@@ -27265,10 +27872,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "מכללה"
@@ -27276,5 +27883,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -27282,5 +27889,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "קולנוע"
@@ -27289,10 +27896,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "ספרייה"
@@ -27301,9 +27908,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -27311,10 +27918,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -27323,10 +27930,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -27336,5 +27943,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -27343,6 +27950,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "דת"
@@ -27351,66 +27958,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr ""
@@ -27419,189 +28026,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "סוני"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "כתובות"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "ערוך כתובת"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "מספר בית"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "שם בית"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "שם רחוב"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "שם עיר"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "מיקוד"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "קוד מדינה"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "סכמת מספור"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "אי-זוגי"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "זוגי"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "מגדל"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27609,25 +28146,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -27635,10 +28172,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -27646,10 +28183,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "צינור"
@@ -27658,41 +28195,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "מיקום"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr ""
@@ -27702,10 +28239,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr ""
@@ -27713,5 +28250,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr ""
@@ -27719,10 +28256,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr ""
@@ -27730,10 +28267,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr ""
@@ -27741,23 +28278,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr ""
@@ -27767,35 +28304,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -27804,10 +28341,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr ""
@@ -27816,5 +28353,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27822,10 +28359,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -27836,23 +28373,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "קו מתח"
@@ -27861,20 +28398,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27882,55 +28419,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "שירותים"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "טלפון"
@@ -27939,5 +28476,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -27945,5 +28482,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr ""
@@ -27951,5 +28488,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr ""
@@ -27957,5 +28494,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27963,5 +28500,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr ""
@@ -27969,15 +28506,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr ""
@@ -27986,5 +28523,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -27992,35 +28529,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr ""
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28028,5 +28560,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28035,31 +28567,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28138,5 +28670,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28146,31 +28678,31 @@
 msgstr "ירוק"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28178,31 +28710,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "מזרקה"
@@ -28211,10 +28743,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -28223,10 +28755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28235,5 +28767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28241,120 +28773,219 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "רגל"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "סופרמרקט"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "ערוך סופרמרקט"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "מכולת"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "ערוך מכולת"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "קיוסק"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "ערוך קיוסק"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "קצבייה"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "ערוך קצבייה"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "מאפייה"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "ערוך מאפייה"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr ""
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "ערוך חנות אורגנית"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr ""
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "ערוך חנות רכב"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "ערוך חנות אופניים"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "סופרמרקט"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "ערוך סופרמרקט"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "מכולת"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "ערוך מכולת"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "קיוסק"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "ערוך קיוסק"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "קצבייה"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "ערוך קצבייה"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "מאפייה"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "ערוך מאפייה"
-
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "מספרה"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "ערוך מספרה"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "ערוך אופטיקאי"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "ערוך חנות מחשבים"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "ערוך חנות נעליים"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "ערוך חנות ספורט"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "ניקוי יבש"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "ערוך ניקוי יבש"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "מכבסה"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "ערוך מכבסה"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "מונית"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "ערוך מגדל"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "ערוך חנות מחשבים"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "ערוך חנות אלקטרוניקה"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "ערוך חנות וידאו"
+
+#. <separator/>
+#: build/trans_presets.java:2970
 msgid "Florist"
 msgstr "פרחים"
@@ -28362,193 +28993,85 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2972
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "ערוך חנות אורגנית"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "ערוך חנות מחשבים"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "ערוך חנות אלקטרוניקה"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "חנות עשה-זאת-בעצמך"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "ערוך חנות עשה-זאת-בעצמך"
+
+#: build/trans_presets.java:2998
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2999
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "חנות עשה-זאת-בעצמך"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "ערוך חנות עשה-זאת-בעצמך"
-
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:3004
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3005
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "מספרה"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "ערוך מספרה"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "ערוך חנות נעליים"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "ערוך חנות וידאו"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "ניקוי יבש"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "ערוך ניקוי יבש"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "מכבסה"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "ערוך מכבסה"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "ערוך חנות ספורט"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "ערוך אופטיקאי"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -28556,5 +29079,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -28562,97 +29085,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "בנק"
@@ -28660,14 +29183,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -28675,5 +29198,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -28681,15 +29204,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "רופאים"
@@ -28697,18 +29220,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -28716,5 +29239,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -28722,9 +29245,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "בית חולים"
@@ -28732,10 +29255,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -28744,5 +29278,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -28751,15 +29285,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -28767,5 +29301,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -28774,368 +29308,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "גבולות"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "לאומי"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "ערוך גבול לאומי"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "מנהלי"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "ערוך גבול מנהלי"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "אזרחי"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "ערוך תחום אזרחי"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "פוליטי"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "ערוך תחום פוליטי"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "גן לאומי"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "ערוך תחום גן לאומי"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "מקומות"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "יבשת"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "ארץ"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "מדינה"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "אזור"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "מחוז"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "ערוך מחוז"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "עיר"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "ערוך עיר"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "עיירה"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "פרבר"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "כפר"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "כפר קטן"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "מקומיות"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "פסגה"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "ערוך פסגה"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "קרחון"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "ערוך קרחון"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "הר געש"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "ערוך הר געש"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "פתח מערה"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "ערוך פתח מערה"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "אי"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "ערוך אי"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "פתח מערה"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "ערוך פתח מערה"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "פסגה"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "ערוך פסגה"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "קרחון"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "ערוך קרחון"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "הר געש"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "ערוך הר געש"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "גבולות"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "לאומי"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "ערוך גבול לאומי"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "מנהלי"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "ערוך גבול מנהלי"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "אזרחי"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "ערוך תחום אזרחי"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "פוליטי"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "ערוך תחום פוליטי"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "גן לאומי"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "ערוך תחום גן לאומי"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
-msgid "Land use"
-msgstr ""
-
-#. group "Land use"
-#: build/trans_presets.java:3179
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "טבע"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
 msgid "Tree"
 msgstr "עץ"
 
-#. item "Land use/Tree"
+#. item "Nature/Tree"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3281
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
 msgid "Wood"
 msgstr "חורש"
 
-#. item "Land use/Wood"
+#. item "Nature/Wood"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3291
 msgid "Edit Wood"
 msgstr "ערוך חורש"
 
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3296
 msgid "Forest"
 msgstr "יער"
 
-#. item "Land use/Forest"
+#. item "Nature/Forest"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3299
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3305
 msgid "Nature Reserve"
 msgstr ""
 
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
 msgid "Edit Nature Reserve"
 msgstr ""
 
-#. item "Land use/Nature Reserve" text "Name"
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3311
 msgid "Scree"
 msgstr ""
 
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
 msgid "Edit Scree"
 msgstr ""
 
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
 msgid "Scrub"
 msgstr ""
 
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
 msgid "Edit Scrub"
 msgstr ""
 
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
 msgid "Heath"
 msgstr "שדה-בור"
 
-#. item "Land use/Heath"
+#. item "Nature/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3329
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
 
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
+msgid "Land use"
+msgstr ""
+
+#. group "Land use"
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -29144,45 +29684,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29190,25 +29730,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "דשא"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29216,10 +29756,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29227,20 +29767,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr ""
@@ -29248,5 +29788,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29254,15 +29794,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -29270,9 +29810,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -29280,39 +29820,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -29320,15 +29860,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "צבאי"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29336,52 +29876,182 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr ""
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "מידע"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "כתובות"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "ערוך כתובת"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "מספר בית"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "שם בית"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "שם רחוב"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "שם עיר"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "מיקוד"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "קוד מדינה"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+msgid "AT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "מזרח"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "IT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "דרום"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "סכמת מספור"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "אי-זוגי"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "זוגי"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "התנגשות"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "הוסף מידע על היוצר"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "תמונה"
 
 #. item "Relations/Multipolygon"
@@ -29389,5 +30059,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29399,5 +30069,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29405,5 +30075,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29411,5 +30081,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29420,5 +30090,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29426,36 +30096,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29463,5 +30133,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -29470,5 +30140,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29476,34 +30146,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr ""
@@ -29512,15 +30182,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr ""
@@ -29528,5 +30198,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29535,5 +30205,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29541,132 +30211,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "אופניים"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29734,5 +30293,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29742,9 +30301,9 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29758,10 +30317,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -29769,31 +30328,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -29802,30 +30361,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -33924,9 +34483,12 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
 
+#~ msgid "Keep backup files"
+#~ msgstr "שמור קובצי גיבוי"
+
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -33953,7 +34515,4 @@
 #~ msgstr "טען בחירה"
 
-#~ msgid "Contact {0}..."
-#~ msgstr "צור קשר עם {0}..."
-
 #~ msgid "Merging conflicts."
 #~ msgstr "התנגשויות מתמזגות"
@@ -34000,9 +34559,4 @@
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "תמונה"
-#~ msgstr[1] "תמונות"
 
 #~ msgid "Unsaved Changes"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 22859)
+++ applications/editors/josm/i18n/po/is.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-14 00:09+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 00:49+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-08-20 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Aðvörun"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "OpenStreetMap ritill"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -261,5 +261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -294,5 +294,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -402,4 +402,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -417,5 +418,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1037,5 +1038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1044,5 +1045,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr ""
@@ -1435,13 +1436,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1450,5 +1451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1456,9 +1457,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1466,5 +1467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1498,8 +1499,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1508,9 +1509,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1526,6 +1527,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1535,5 +1536,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1558,6 +1559,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Villa"
@@ -1716,5 +1717,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr ""
@@ -1992,5 +1993,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2453,5 +2454,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2492,18 +2493,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2768,5 +2769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Leit"
@@ -2958,7 +2959,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3223,5 +3224,5 @@
 msgstr[1] "Færði {0} hnúta"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3375,31 +3376,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3418,15 +3419,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3435,5 +3436,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3442,5 +3443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3449,5 +3450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3456,5 +3457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3462,5 +3463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3469,5 +3470,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3476,5 +3477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3483,5 +3484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3490,10 +3491,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3613,5 +3614,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3683,9 +3684,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3693,5 +3694,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3881,14 +3882,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Raða"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+msgid "Hemisphere"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3913,9 +3932,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3958,5 +3977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr ""
@@ -3977,5 +3996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4224,69 +4243,69 @@
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4296,9 +4315,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4306,57 +4325,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Upphafsstilli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debetkort"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4366,9 +4394,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4382,9 +4410,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4506,23 +4535,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4613,5 +4642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4619,17 +4648,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4639,25 +4668,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5052,4 +5081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5132,4 +5162,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5146,4 +5177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5217,5 +5249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5227,10 +5259,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr ""
@@ -5312,5 +5344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5322,5 +5354,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5355,17 +5387,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Hlutverk:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5373,15 +5405,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5389,10 +5421,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5404,5 +5436,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5414,5 +5446,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5555,5 +5587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5666,5 +5698,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5672,5 +5704,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5678,5 +5710,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5684,5 +5716,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5690,5 +5722,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5697,5 +5729,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5703,5 +5735,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5709,5 +5741,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5715,24 +5747,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5753,5 +5785,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5776,37 +5808,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Sláðu inn hnit fyrir nýja hnútinn."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Nota tugabrotsgráður."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Neikvæð gildi tákna vestur- og suðurhvel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5862,9 +5894,9 @@
 msgstr "Upplýsingar um lag"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Vensl"
@@ -5912,10 +5944,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5935,37 +5967,37 @@
 msgstr "Opna vallistann."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Þysja að vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Þysja að völdum hlut(um)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5974,27 +6006,27 @@
 msgstr "Val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Val: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Opna þessa stiku sem glugga"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6003,5 +6035,5 @@
 "vinstri tólastikunni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Smelltu til að minnka/hámarka innihald stikunnar"
@@ -6278,13 +6310,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6396,4 +6428,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6412,6 +6448,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6429,8 +6463,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6441,4 +6482,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6453,33 +6500,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6503,12 +6539,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6580,10 +6626,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6613,8 +6663,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6677,6 +6723,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6729,4 +6773,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6791,32 +6847,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6825,6 +6889,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6833,24 +6899,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6865,82 +6921,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7021,155 +7077,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Heiti"
@@ -7593,4 +7654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<mismunandi>"
@@ -8100,17 +8162,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "ná einnig í fyrsta-stigs undirvensl yfirvenslanna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Næ í yfirvensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8387,4 +8449,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8392,15 +8455,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Gerð"
@@ -8419,16 +8482,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "óskilgreint"
@@ -8995,5 +9058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9216,20 +9279,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Lag"
@@ -9680,11 +9743,6 @@
 msgstr[1] "{0} hlutum verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9692,5 +9750,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9698,5 +9757,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -9706,23 +9765,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr "Lýsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr "Tímaspan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr "Lengd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
 msgstr "Lengd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -9731,5 +9793,6 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -9738,10 +9801,23 @@
 msgstr[1] "{0} punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} ferill"
+msgstr[1] "{0} ferlar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9749,10 +9825,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9763,7 +9839,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9771,10 +9847,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9782,10 +9858,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9793,21 +9869,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9817,9 +9893,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9827,5 +9903,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9833,30 +9909,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9864,5 +9940,5 @@
 msgstr "Sérsníða liti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9871,5 +9947,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9878,18 +9954,18 @@
 msgstr "Veldu lit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Flytja inn hljóð"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9899,23 +9975,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Flytja inn myndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10348,15 +10424,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Engin mynd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11287,4 +11363,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Nýtt gildi fyrir {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11367,5 +11486,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Bíll"
@@ -11384,16 +11503,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Hjól"
@@ -11427,12 +11546,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Fótgangandi"
@@ -11682,18 +11801,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Teiknistíll korts"
@@ -12009,26 +12128,18 @@
 msgstr "Ekki var hægt að virkja vörpunina „{0}“. Nota Meracator í staðin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12144,6 +12255,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+msgid "Internal style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12360,12 +12479,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12545,5 +12656,5 @@
 msgstr "Bæta við nýju taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12552,49 +12663,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Frekari upplýsingar um þessa forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Valfrjáls eigind:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12604,15 +12715,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12622,17 +12733,17 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13236,5 +13347,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13332,5 +13443,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13339,5 +13450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13406,5 +13517,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13414,10 +13525,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13425,5 +13536,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13431,5 +13542,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13437,10 +13548,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13448,5 +13559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13454,5 +13565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13460,5 +13571,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13467,10 +13578,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13478,9 +13589,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13488,11 +13599,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Ógildur hlutur með kenni=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13504,8 +13615,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13519,5 +13630,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13525,5 +13636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13532,6 +13643,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13543,6 +13654,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13551,5 +13662,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13557,5 +13668,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13563,12 +13674,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13576,5 +13687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13584,5 +13695,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13592,5 +13703,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13598,17 +13709,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Undirbý gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14105,11 +14216,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14118,16 +14229,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14136,5 +14247,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14155,13 +14266,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Gera ekkert"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Senda villutilkynningu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14170,9 +14281,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Óvænt villa"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14180,5 +14291,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14186,5 +14297,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14193,5 +14304,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14199,9 +14310,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "Textinn hefur verið þegar verið afritaður"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14395,5 +14506,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14446,5 +14557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14457,5 +14568,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14465,5 +14576,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14474,5 +14585,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Ráð: Þú getur breytt flýtileiðum í valkostum)"
@@ -14573,5 +14684,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14657,10 +14768,61 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Opnunartími"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Breyta eigindum allt að {0} hluts"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Velja lit"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Kort: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Tól: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Hraði"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -14832,51 +14994,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Get ekki bætt við hnút handan endamarka veraldar."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14975,16 +15139,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -14998,5 +15154,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15109,5 +15265,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Byggingar"
@@ -15344,5 +15500,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15757,8 +15913,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15872,6 +16024,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Tómt lag"
@@ -17223,5 +17375,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
@@ -17265,48 +17417,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Vegpunktar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "búa til nýja hluti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17315,34 +17471,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17565,58 +17721,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Gagnvirkt kort"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17900,11 +18056,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Breyti leiðslu"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -18981,5 +19136,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Marghyrningur"
@@ -19099,59 +19254,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19630,140 +19785,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19783,7 +19938,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "Tölvubúð"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19881,7 +20035,6 @@
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Vegpunktar"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -19898,9 +20051,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -19959,21 +20112,21 @@
 msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -19984,5 +20137,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -19991,5 +20144,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -19997,10 +20150,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20009,24 +20162,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20037,75 +20190,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -20664,16 +20841,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20681,5 +20863,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20687,5 +20869,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20694,5 +20876,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20701,10 +20883,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20712,15 +20894,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20730,5 +20912,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20737,10 +20919,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20749,5 +20931,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20756,15 +20938,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20774,15 +20956,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20791,5 +20973,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20798,5 +20980,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20805,10 +20987,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20817,5 +20999,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20825,5 +21007,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20832,20 +21014,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20854,5 +21036,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20894,4 +21076,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20924,10 +21107,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Vegir"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Stræti"
@@ -20938,5 +21121,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Hraðbraut"
@@ -20945,5 +21128,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Breyti hraðbraut"
@@ -20980,10 +21163,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Tilvísun"
@@ -20997,8 +21180,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Akreinar"
@@ -21017,13 +21200,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -21057,17 +21240,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -21104,17 +21287,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21148,17 +21331,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Göng"
@@ -21189,17 +21372,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -21230,17 +21413,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -21248,5 +21431,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Tengibraut á hraðbraut"
@@ -21255,5 +21438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Breyti tengibraut á hraðbraut"
@@ -21261,5 +21444,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Stofnvegur"
@@ -21268,5 +21451,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Breyti stofnveg"
@@ -21276,6 +21459,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Hraðbrautarlíkar aðgangstakmarkanir"
@@ -21283,5 +21466,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Tengivegur á stofnveg"
@@ -21290,5 +21473,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Breyti tengiveg á stofnveg"
@@ -21301,5 +21484,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Fyrsta stigs"
@@ -21308,5 +21491,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Breyti fyrsta stigs veg"
@@ -21314,10 +21497,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Tengivegur á fyrsta stigs veg"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -21329,5 +21512,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Annars stigs vegur"
@@ -21337,5 +21520,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Breyti annars stigs veg"
@@ -21343,5 +21526,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Þriðja stigs vegur"
@@ -21351,5 +21534,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Breyti þriðja stigs veg"
@@ -21361,5 +21544,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Óflokkaður"
@@ -21369,5 +21552,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Breyti óflokkuðum veg"
@@ -21377,6 +21560,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21399,15 +21582,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -21419,5 +21602,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Íbúðargata"
@@ -21426,5 +21609,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Breyti íbúðargötu"
@@ -21444,12 +21627,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Slitlag"
@@ -21471,166 +21654,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "malbikaður"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "ómalbikaður"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "skógur"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "götusteinn"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21638,5 +21821,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Vistgata"
@@ -21645,5 +21828,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Breyti vistgötu"
@@ -21651,5 +21834,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Göngugata"
@@ -21658,5 +21841,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Breyti göngugötu"
@@ -21664,5 +21847,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Þjónustuvegur"
@@ -21671,5 +21854,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Breyta þjónustuveg"
@@ -21679,18 +21862,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Gerð þjónustuvegs"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "port"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "heimreið"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "bílastæðavegur"
@@ -21698,5 +21881,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Bílastæðavegur"
@@ -21706,10 +21889,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Breyti bílastæðaveg"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Vegur (óþekkt flokkun)"
@@ -21718,5 +21901,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Breyti veg af óþekktri flokkun"
@@ -21724,14 +21907,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Í byggingu"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Breyti veg í byggingu"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Hringtorg"
@@ -21747,5 +21930,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "hringtorg"
@@ -21754,5 +21937,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Vegtakmarkanir"
@@ -21761,15 +21944,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Breyti vegtakmörkunum"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Tollur"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -21777,5 +21960,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Aðgangur"
@@ -21801,4 +21984,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21806,4 +21990,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21879,236 +22069,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "einkavegur"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "leyfður"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "í landbúnaðarskyni"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nei"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "einkavegur"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "leyfður"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "í landbúnaðarskyni"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nei"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22123,10 +22320,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Hestar"
@@ -22142,10 +22339,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Vélhjól"
@@ -22160,19 +22358,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Bifreið"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Lámarkshraði (km/klst)"
@@ -22180,20 +22378,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Hámarksþyngt (í tonnum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Hámarkshæð (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Hámarksbreidd (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Hámarkslengd (í metrum)"
@@ -22201,5 +22399,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Hringtorg"
@@ -22210,5 +22408,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Breyti hringtorgi"
@@ -22228,10 +22426,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "hraðbraut"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "tengibraut á hraðbraut"
@@ -22253,10 +22451,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "stofnvegur"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22278,10 +22476,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22303,5 +22501,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22316,9 +22514,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "óflokkaður"
@@ -22332,9 +22530,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "íbúðargata"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "vistgata"
@@ -22378,10 +22576,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "þjónustuvegur"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22411,5 +22609,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22421,10 +22619,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Breyti brú"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Breyti göngum"
@@ -22432,10 +22630,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Vegir"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22444,35 +22642,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22480,5 +22678,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr ""
@@ -22487,76 +22685,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr ""
@@ -22565,5 +22763,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22571,5 +22769,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Breyti reiðstíg"
@@ -22577,5 +22775,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22593,11 +22791,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Breyti hjólastíg"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22605,5 +22803,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22611,5 +22809,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22617,5 +22815,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22624,5 +22822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Breyti göngustíg"
@@ -22630,5 +22828,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Stigi"
@@ -22638,10 +22836,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Breyti stiga"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr ""
@@ -22649,15 +22852,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Tilvísun"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Vegþjónustur"
@@ -22665,5 +22868,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Breyti vegþjónustu"
@@ -22671,10 +22874,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22703,36 +22907,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Rekstraraðili"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "lækur"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Breyti veitingastað"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Neyðarsími"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -22742,5 +22967,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -22749,27 +22974,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "eyja"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22777,6 +23002,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22785,11 +23010,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22797,30 +23022,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr ""
@@ -22828,67 +23053,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Gangbraut"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -22899,14 +23062,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "réttsælis"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Gangbraut"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Beygjuhringur"
@@ -22916,5 +23141,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Borgarmörk"
@@ -22922,15 +23147,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Breyti borgarmarkaskilti"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Hraðamyndavél"
@@ -22939,11 +23164,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Neyðarsími"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22951,5 +23171,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -22957,5 +23177,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -22965,10 +23185,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Vað"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Breyti vaði"
@@ -22976,5 +23196,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -22982,5 +23202,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Breyti skarði"
@@ -22989,10 +23209,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -23000,5 +23220,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Tálmar"
@@ -23006,5 +23226,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23012,5 +23232,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23055,16 +23275,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23073,5 +23293,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23079,5 +23299,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -23085,10 +23305,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23096,15 +23316,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Tollskýli"
@@ -23112,5 +23332,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Breyti tollskýli"
@@ -23118,10 +23338,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -23130,5 +23350,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Limgerði"
@@ -23139,22 +23359,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr ""
@@ -23162,5 +23382,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -23169,5 +23389,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23178,10 +23398,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
@@ -23189,5 +23409,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Hlið"
@@ -23195,50 +23415,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23246,25 +23466,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23272,25 +23492,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Vatn"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Goshver"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Breyti goshver"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Frárennsli"
@@ -23298,10 +23507,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23309,10 +23518,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Lækur"
@@ -23320,10 +23529,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -23331,10 +23540,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Á"
@@ -23344,59 +23553,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Breyti á"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Goshver"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Breyti goshver"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Foss"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Breyti fossi"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr ""
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Stífla"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Breyti stíflu"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr ""
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr ""
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Breyti landi"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr ""
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Strandlengja"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Breyti strandlengju"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -23405,10 +23668,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Votlendi"
@@ -23419,14 +23683,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -23440,35 +23704,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Leðja"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Strönd"
@@ -23476,20 +23740,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Flói"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Klettur"
@@ -23497,145 +23761,214 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Strandlengja"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Breyti strandlengju"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Goshver"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Bíll"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "hjól"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Siglingarleið ferju"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Skipakví"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Breyti skipakví"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Stífla"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Breyti stíflu"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Vatnspunktar"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Smábátahöfn"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Breyti smábátahöfn"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Bryggja"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Breyti bryggju"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr ""
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Foss"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Breyti fossi"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Smábátahöfn"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Breyti smábátahöfn"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Bryggja"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Breyti bryggju"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23645,16 +23978,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Skipakví"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Breyti skipakví"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Samgöngur"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr ""
@@ -23662,5 +24017,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr ""
@@ -23690,7 +24045,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23706,8 +24061,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23721,29 +24076,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23756,8 +24111,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23828,8 +24183,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23841,8 +24196,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Volt"
@@ -23855,8 +24210,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23869,23 +24224,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr ""
@@ -23893,50 +24248,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -23944,5 +24299,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23951,10 +24306,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr ""
@@ -23963,9 +24318,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr ""
@@ -23974,5 +24329,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -23981,5 +24336,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -23989,5 +24344,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -23995,5 +24350,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr ""
@@ -24002,5 +24357,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24009,10 +24364,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -24020,10 +24375,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -24031,10 +24386,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Kláfur"
@@ -24042,10 +24397,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Breyti kláf"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24053,10 +24408,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24065,5 +24421,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24071,5 +24427,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24078,5 +24434,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24084,5 +24440,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -24092,69 +24448,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24171,34 +24549,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24206,37 +24585,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Opnunartími"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24257,33 +24647,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24292,170 +24684,191 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "Breyti skóbúð"
+
+#: build/trans_presets.java:1359
+msgid "convenience"
+msgstr ""
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Sjoppa"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24463,4 +24876,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24472,6 +24886,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Stæði"
@@ -24480,5 +24894,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -24489,25 +24903,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Tilvísun"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "slitlag"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24516,54 +24932,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Breyti bílabúð"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr ""
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "já"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Breyti tré"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Árekstrar"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Leiga"
@@ -24572,10 +25132,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr ""
@@ -24583,28 +25142,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr ""
+
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Breyti hjólastæði"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr ""
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Vélhjól"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Breyti hraðbraut"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Vegþjónustur"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Vista"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "land"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Forstillingar"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Föt"
 
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr ""
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Breyti hjólabúð"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24614,5 +25232,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24620,5 +25238,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -24626,5 +25244,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -24632,5 +25250,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -24638,5 +25256,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr ""
@@ -24645,5 +25263,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr ""
@@ -24651,5 +25269,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr ""
@@ -24658,5 +25276,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr ""
@@ -24668,5 +25286,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24674,10 +25292,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr ""
@@ -24686,10 +25304,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr ""
@@ -24698,5 +25316,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -24705,5 +25323,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -24711,5 +25329,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -24719,13 +25337,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Skýli"
@@ -24733,19 +25350,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Bekkur"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -24753,5 +25370,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -24759,5 +25376,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -24765,10 +25382,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Flugvöllur"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24776,5 +25393,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24782,10 +25399,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr ""
@@ -24794,5 +25411,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24800,5 +25417,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24806,5 +25423,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24812,5 +25429,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24818,5 +25435,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24824,5 +25441,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24832,5 +25449,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24840,5 +25457,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24849,6 +25466,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr ""
@@ -24858,5 +25475,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24865,5 +25482,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24871,5 +25488,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24877,15 +25494,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Ferðamennska"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Gisting"
@@ -24897,5 +25514,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -24904,5 +25521,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
@@ -24915,8 +25532,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stjörnur"
@@ -24940,34 +25557,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -24981,168 +25598,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Vegahótel"
@@ -25150,20 +25672,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -25171,10 +25693,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -25182,30 +25704,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -25213,10 +25736,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -25227,5 +25750,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -25233,5 +25756,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
@@ -25239,5 +25762,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -25245,79 +25770,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamborgarar"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -25325,18 +25850,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25344,10 +25869,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -25355,10 +25880,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Bar"
@@ -25366,20 +25896,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25387,10 +25917,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -25398,25 +25928,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Safn"
@@ -25424,9 +25954,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -25435,9 +25965,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Skemmtigarður"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Breyti skemmtigarð"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Listaverk"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Breyti listaverki"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -25445,50 +25996,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Skemmtigarður"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Breyti skemmtigarð"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Listaverk"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Breyti listaverki"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Breyti skýli"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Eldstæði"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25526,5 +26078,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25532,28 +26084,28 @@
 msgstr "stræti"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -25563,5 +26115,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25569,5 +26121,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr ""
@@ -25575,6 +26127,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr ""
@@ -25582,5 +26134,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25588,6 +26140,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skíði"
@@ -25595,5 +26147,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25601,46 +26153,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "dýralíf"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25649,5 +26201,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25655,55 +26207,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Breyti skýli"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Eldstæði"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Kastali"
@@ -25712,19 +26243,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -25733,9 +26264,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -25743,10 +26274,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25754,5 +26285,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25760,15 +26291,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -25776,55 +26307,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -25832,35 +26363,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -25874,6 +26405,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -26289,6 +26820,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26323,240 +26854,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26573,5 +27104,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26598,23 +27128,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "gerð"
@@ -26631,5 +27169,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26656,211 +27193,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr ""
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -26868,52 +27408,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -26921,204 +27461,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Bifreið"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Breyti lækni"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Aðvörun"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Breyti stæði"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Bifreið"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Breyti lækni"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Breyti skautum"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Breyti landamæraeftirliti"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Bíll"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Breyti kláf"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Mannvirki"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Bygging"
@@ -27126,5 +27732,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -27132,10 +27738,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -27143,10 +27749,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -27154,10 +27760,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -27166,10 +27772,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Fangelsi"
@@ -27178,10 +27784,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -27191,10 +27797,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -27203,10 +27809,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Pósthús"
@@ -27214,5 +27820,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -27220,15 +27826,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Skóli"
@@ -27236,10 +27842,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Háskóli"
@@ -27247,10 +27853,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Menntaskóli"
@@ -27258,5 +27864,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -27264,5 +27870,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -27271,10 +27877,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bókasafn"
@@ -27283,9 +27889,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -27293,10 +27899,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Leikhús"
@@ -27305,10 +27911,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -27318,5 +27924,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -27325,6 +27931,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr ""
@@ -27333,66 +27939,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr ""
@@ -27401,189 +28007,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Heimilisfang"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Breyti heimilisfangi"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Húsnúmer"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nafn húss"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nafn götu"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Nafn bæjar"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Póstnúmer"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Landskóði"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr ""
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr ""
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27591,25 +28127,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Viti"
@@ -27617,10 +28153,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -27628,10 +28164,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -27640,41 +28176,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr ""
@@ -27684,10 +28220,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Krani"
@@ -27695,5 +28231,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Breyti krana"
@@ -27701,10 +28237,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr ""
@@ -27712,10 +28248,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -27723,23 +28259,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Rafall"
@@ -27749,35 +28285,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Orkuver"
@@ -27786,10 +28322,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -27798,5 +28334,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -27804,10 +28340,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -27818,23 +28354,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Raflína"
@@ -27843,20 +28379,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27864,55 +28400,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Salerni"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -27921,5 +28457,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -27927,5 +28463,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mynt"
@@ -27933,5 +28469,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Athugasemd"
@@ -27939,5 +28475,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27945,5 +28481,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -27951,15 +28487,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -27968,5 +28504,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -27974,35 +28510,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Dósir"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Föt"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28010,5 +28541,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28017,31 +28548,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28120,5 +28651,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28128,31 +28659,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28160,31 +28691,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -28193,10 +28724,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -28205,10 +28736,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28217,5 +28748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28223,501 +28754,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Fótgangandi"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr ""
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Sjoppa"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Breyti sjoppu"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Slátrari"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Breyti slátrara"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Bakarí"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Breyti bakaríi"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Lífræn búð"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Breyti lífrænni búð"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Vínbúð"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Verslanir"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Hársnyrtir"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Breyti hársnyrti"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Breyti sjóntækjasmið"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Breyti tölvubúð"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Skóbúð"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Breyti skóbúð"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Útivistarbúð"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Breyti útivistarbúð"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Efnalaug"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Breyti efnalaug"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Þvottahús"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Breyti þvottahúsi"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Leigubílastöð"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Breyti turni"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Tölvubúð"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Breyti tölvubúð"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Raftækjabúð"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Breyti raftækjabúð"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hljómtækjaverslun"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Breyti hljómtækjaverslun"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Blómabúð"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Breyti blómabúð"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Húsgagnaverslun"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Breyti húsgagnaverslun"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Skrifstofuvörur"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Breyti skrifstofuvörum"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Ferðaskrifstofa"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Breyti ferðaskrifstofu"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Dótabúð"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Breyti dótabúð"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Sjálfsali"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr ""
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr ""
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "dagblöð"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "dót"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Fjármál"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banki"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Breyti banka"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Hraðbanki"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Gjaldeyrisskipti"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Breyti gjaldeyrisskiptum"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Breyti hraðbanka"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Heilsa"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Læknir"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Breyti lækni"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Tannlæknir"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Breyti tannlækni"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Apótek"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Apótek"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr ""
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Spítali"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Breyti spítala"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Barnalúga"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Verslanir"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Breyti bílabúð"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Breyti hjólabúð"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr ""
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr ""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Sjoppa"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Breyti sjoppu"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Ferðaskrifstofa"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Breyti ferðaskrifstofu"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Slátrari"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Breyti slátrara"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Bakarí"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Breyti bakaríi"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Blómabúð"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Breyti blómabúð"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Lífræn búð"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Breyti lífrænni búð"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Vínbúð"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Tölvubúð"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Breyti tölvubúð"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Raftækjabúð"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Breyti raftækjabúð"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hljómtækjaverslun"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Breyti hljómtækjaverslun"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Húsgagnaverslun"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Breyti húsgagnaverslun"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Skrifstofuvörur"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Breyti skrifstofuvörum"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Hársnyrtir"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Breyti hársnyrti"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Skóbúð"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Breyti skóbúð"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Dótabúð"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Breyti dótabúð"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Efnalaug"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Breyti efnalaug"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Þvottahús"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Breyti þvottahúsi"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Útivistarbúð"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Breyti útivistarbúð"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Breyti sjóntækjasmið"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Sjálfsali"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr ""
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr ""
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "dagblöð"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "dót"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Fjármál"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banki"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Breyti banka"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Hraðbanki"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Gjaldeyrisskipti"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Breyti gjaldeyrisskiptum"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Breyti hraðbanka"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Heilsa"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Læknir"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Breyti lækni"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Tannlæknir"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Breyti tannlækni"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Apótek"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Apótek"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr ""
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Spítali"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Breyti spítala"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -28726,5 +29259,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28733,15 +29266,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28749,5 +29282,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -28756,368 +29289,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Landafræði"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Landamæri"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr ""
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr ""
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr ""
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Breyti landamærum þjóðgarðs"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Staðir"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Heimsálfa"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Land"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Breyti landi"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Fylki"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Breyti fylki"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Svæði"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Sýsla"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Breyti sýslu"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Borg"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Breyti borg"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Bær"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Hverfi"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Þorp"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Smáþorp"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Tindur"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Breyti tind"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Jökull"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Breyti jökli"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Eldfjall"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Breyti eldfjalli"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Hellismunni"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Breyti hellismunna"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Eyja"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "náttúran"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Tré"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Breyti tré"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Fræðiheiti"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Skógur"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Breyti skóg"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "barrskógur"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "laufskógur"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "blandaður"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Skógur (ræktaður)"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Breyti ræktuðum skóg"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr ""
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr ""
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Hellismunni"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Breyti hellismunna"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Tindur"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Breyti tind"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Jökull"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Breyti jökli"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Eldfjall"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Breyti eldfjalli"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Landamæri"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Breyti landamærum þjóðgarðs"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr ""
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr ""
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr ""
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Tré"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Breyti tré"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Fræðiheiti"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Skógur"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Breyti skóg"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "barrskógur"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "laufskógur"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "blandaður"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Skógur (ræktaður)"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Breyti ræktuðum skóg"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr ""
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr ""
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr ""
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr ""
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr ""
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr ""
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr ""
@@ -29126,45 +29665,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29172,25 +29711,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29198,10 +29737,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29209,20 +29748,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr ""
@@ -29230,5 +29769,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29236,15 +29775,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -29252,9 +29791,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr ""
@@ -29262,39 +29801,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -29302,15 +29841,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29318,52 +29857,182 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr ""
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Upplýsingar"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Heimilisfang"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Breyti heimilisfangi"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Húsnúmer"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nafn húss"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nafn götu"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Nafn bæjar"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Póstnúmer"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Landskóði"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+msgid "AT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "A"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "IT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr ""
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr ""
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Árekstrar"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Bæta við höfundaupplýsingum"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "Vefsíða."
 
 #. item "Relations/Multipolygon"
@@ -29371,5 +30040,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -29381,5 +30050,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29387,5 +30056,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29393,5 +30062,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29402,5 +30071,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29408,36 +30077,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29445,5 +30114,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -29452,5 +30121,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -29458,34 +30127,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -29494,15 +30163,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 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:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "að vegi"
@@ -29510,5 +30179,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29517,5 +30186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29523,132 +30192,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "hjól"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29716,5 +30274,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29724,9 +30282,9 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29740,10 +30298,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -29751,31 +30309,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -29784,30 +30342,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -33785,7 +34343,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -33907,8 +34464,11 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Waterway Point"
+#~ msgstr "Vatnspunktar"
 
 #~ msgid "Incorrect password or username."
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 22859)
+++ applications/editors/josm/i18n/po/it.po	(revision 22863)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-18 11:08+0000\n"
-"Last-Translator: paolomedina <Unknown>\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-26 11:39+0000\n"
+"Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -72,5 +72,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -91,5 +91,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Attenzione"
@@ -118,9 +118,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -128,5 +128,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -238,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -277,5 +277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -300,5 +300,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -408,4 +408,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -423,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1061,5 +1062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1068,5 +1069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1079,5 +1080,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "Indirizzo URL"
@@ -1479,20 +1480,21 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Purge..."
-msgstr ""
+msgstr "Epura..."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Forget objects but do not delete them on server when uploading."
 msgstr ""
+"Dimentica gli oggetti ma non eliminarli sul server durante il caricamento."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+msgstr "Epura"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+msgstr "Conferma epurazione"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1500,22 +1502,29 @@
 "uploading."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+"Questa operazione indica a JOSM di dimenticare gli oggetti selezionati.<br> "
+"Questi saranno rimossi dal livello, ma <i>non</i> eliminati<br> sul server "
+"durante il caricamento."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
 "selected objects:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+"Saranno epurati anche gli oggetti collegati seguenti<br> in aggiunta agli "
+"oggetti selezionati:"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Aggiungi alla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
 "discarded.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+"Alcuni degli oggetti sono stati modificati.<br> Procedi, se questi "
+"cambiamenti dovrebbero essere scartati.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Svuota il buffer Annulla/Rifai"
@@ -1549,8 +1558,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1559,9 +1568,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1577,6 +1586,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1586,5 +1595,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1609,6 +1618,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Errore"
@@ -1771,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "No, annulla"
@@ -2062,5 +2071,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2561,5 +2570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2603,5 +2612,5 @@
 "Si vuole veramente spostarli?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2609,5 +2618,5 @@
 "rettangolo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2616,9 +2625,9 @@
 "più vicino."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2910,5 +2919,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Cerca"
@@ -3123,7 +3132,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3398,5 +3407,5 @@
 msgstr[1] "Sposta {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3555,6 +3564,6 @@
 msgstr "Correzione automatica etichette"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
@@ -3563,10 +3572,10 @@
 "disabilitato"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "Impossibile creare il file {0}, sarà utilizzato un altro nome"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
@@ -3575,15 +3584,15 @@
 "ignorato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "Impossibile eliminare il vecchio file di backup {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "Errore durante la creazione del backup del livello rimosso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3602,15 +3611,15 @@
 msgstr "Valore ''''{0}'''' non valido per la longitudine"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Errore di formato nel file di configurazione alla linea {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3621,5 +3630,5 @@
 "delle preferenze ''{0}'' non è in realtà una cartella."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3630,5 +3639,5 @@
 "preferenze ''{0}'' non è in realtà una cartella.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3639,5 +3648,5 @@
 "possibile creare la cartella delle preferenze mancante: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3648,5 +3657,5 @@
 "creare la cartella delle preferenze mancante: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3656,5 +3665,5 @@
 "file di preferenze predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3665,5 +3674,5 @@
 "file predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3674,5 +3683,5 @@
 "reimpostare il file delle preferenze con uno predefinito: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3684,5 +3693,5 @@
 "predefinito.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3693,5 +3702,5 @@
 "possibile reimpostare il file delle preferenze con uno predefinito: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
@@ -3699,5 +3708,5 @@
 "Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3829,5 +3838,5 @@
 "incluso"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3856,4 +3865,6 @@
 "the source dataset"
 msgstr ""
+"L''oggetto di tipo {0} con id {1} è stato marcato come da rimuovere, però è "
+"assente dall''insieme di dati sorgente"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
@@ -3885,4 +3896,5 @@
 msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
+"Conflitto nell''attributo ''visible'' per l''oggetto di tipo {0} con id {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3905,9 +3917,9 @@
 "nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3916,5 +3928,5 @@
 "Impossibile unire perché una delle primitive coinvolte è nuova e l''altra no"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4112,15 +4124,34 @@
 msgstr "Zona {0} PUWG 2000 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Sistema di coordinate svizzero (Svizzera)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Zona UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Nord"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "sud"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Salta lì"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4144,9 +4175,9 @@
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM Francia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "UTM Sistema Geodesic"
@@ -4191,5 +4222,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "ferrovia"
@@ -4210,5 +4241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4466,39 +4497,39 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 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:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4506,33 +4537,33 @@
 "gps grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Imposta la lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "opzioni fornite come proprietà di sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Cambia la cartella per tutte le impostazioni utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4546,9 +4577,9 @@
 "allocata (in megabyte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4558,55 +4589,65 @@
 "questo ordine."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Inizializzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Aggiornando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Installando plugins aggiornati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Creazione dell''interfaccia principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Dati OSM non salvati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Ripristina"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "Carte di debito"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM ha trovato {0} livelli di dati OSM non salvati. Probabilmente JOSM è "
 "stato chiuso inaspettatamente. Si desidera ripristinare i dati?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4615,5 +4656,5 @@
 "più usata."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4627,9 +4668,9 @@
 "di JOSM.</li></ul>Maggiori informazioni:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "Esci da JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Continua, prova comunque"
@@ -4643,9 +4684,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4770,23 +4812,23 @@
 msgstr "Utente:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Il livello ''{0}'' deve essere contenuto in una lista di livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Metrico"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Cinese"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Anglosassone"
@@ -4886,5 +4928,5 @@
 "Cliccare per chiudere la finestra ed annullare l''eliminazione degli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4894,17 +4936,17 @@
 "ad un determinato livello di ingrandimento.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Livello di ingrandimento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "dal tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "fino al tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4918,25 +4960,25 @@
 "y</i>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Indirizzo del tassello:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Applica l''indirizzo del tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Si prega di inserire un indirizzo di tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Il valore corrente non è un indirizzo di tassello valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Si prega di inserire un indice di tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5371,4 +5413,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5456,4 +5499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5470,4 +5514,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5545,5 +5590,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5555,10 +5600,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "nessuno"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "tutti"
@@ -5644,5 +5689,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5654,5 +5699,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5688,17 +5733,17 @@
 msgstr "Non ancora deciso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Ruolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Inserire un ruolo per tutte le appartenenze alla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Etichetta le relazioni modificate con "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5708,10 +5753,10 @@
 "applicata<br>a tutte le relazioni modificate.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Chiave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
@@ -5720,5 +5765,5 @@
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5726,5 +5771,5 @@
 msgstr "Valore:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5733,5 +5778,5 @@
 "membri</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5749,5 +5794,5 @@
 "la strada originale nella relazione.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5766,5 +5811,5 @@
 "originale nella relazione.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Applica questo ruolo a tutti i membri"
@@ -5923,5 +5968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -6040,5 +6085,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -6046,5 +6091,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -6052,5 +6097,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -6058,5 +6103,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -6064,5 +6109,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -6071,5 +6116,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6077,5 +6122,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6083,5 +6128,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6089,24 +6134,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro attivo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> oggetti nascosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> oggetti disabilitati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6128,5 +6173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6151,26 +6196,26 @@
 msgstr "Informazioni avanzate sull''oggetto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Inserire le coordinate per il nuovo nodo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Usa i gradi decimali."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valori negativi denotano l''emisfero Occidentale/Meridionale."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 "Per favore inserire un valore di latitudine valido nell''intervallo -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Per favore inserire un valore di latitudine nell''intervallo -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr ""
@@ -6178,14 +6223,14 @@
 "180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr ""
 "Per favore inserire un valore di longitudine nell''intervallo -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Chiudi la finestra e crea un nuovo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Chiudi la finestra, ma non creare un nuovo nodo"
@@ -6241,9 +6286,9 @@
 msgstr "Informazioni sul livello"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relazioni"
@@ -6293,10 +6338,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Scarica i membri incompleti delle relazioni selezionate"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Scarica membri incompleti"
@@ -6316,37 +6361,37 @@
 msgstr "Apri una finestra con la lista delle selezioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Cerca oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Ingrandisci visuale sulla selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Ingrandisci la visuale sugli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Apri editor per la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Apri l''editor delle relazioni per la relazione selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6355,27 +6400,27 @@
 msgstr "Selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Ottieni informazioni dettagliate sullo stato interno degli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Analizza"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Stacca il pannello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6384,5 +6429,5 @@
 "degli strumenti a sinistra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
@@ -6678,14 +6723,14 @@
 msgstr "Niente su cui ingrandire la visuale"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 "Il contenuto di questo gruppo di modifiche non è stato ancora scaricato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Scarica adesso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Scarica il contenuto del gruppo di modifiche"
@@ -6797,4 +6842,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6813,6 +6862,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6830,8 +6877,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6842,4 +6896,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6854,33 +6914,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6904,12 +6953,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6981,10 +7040,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -7014,8 +7077,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -7078,6 +7137,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7130,4 +7187,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7192,32 +7261,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7226,6 +7303,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7234,24 +7313,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7266,82 +7335,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7422,155 +7491,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nome"
@@ -8056,4 +8130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<diverso>"
@@ -8609,17 +8684,17 @@
 "Eccezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "inclusi i figli diretti delle relazioni da cui dipendono"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Carica le relazioni da cui dipende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Caricamento delle relazioni da cui dipende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Modifica la relazione correntemente selezionata"
@@ -8742,5 +8817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "Clear textarea"
-msgstr ""
+msgstr "Svuota l''area di testo"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
@@ -8917,4 +8992,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8922,15 +8998,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Tipo"
@@ -8949,16 +9025,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "sconosciuto"
@@ -9610,5 +9686,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Lancia una finestra di selezione file"
@@ -9862,20 +9938,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Layer"
@@ -9963,9 +10039,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Revise"
-msgstr "Revisione"
+msgstr "Rivedi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Continue as is"
-msgstr "Utilizza così com'è"
+msgstr "Utilizza così com''è"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -10394,5 +10470,63 @@
 msgstr[1] "{0} oggetti da eliminare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrizione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} tracciato"
+msgstr[1] "{0} tracciati"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Descrizione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Differenza temporale"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Lunghezza"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Lunghezza: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} itinerario, "
+msgstr[1] "{0} itinerari, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto del percorso"
+msgstr[1] "{0} punti del percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10400,62 +10534,17 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrizione: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} tracciato"
 msgstr[1] "{0} tracciati"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Descrizione"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Differenza temporale"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Lunghezza"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Lunghezza: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} itinerario, "
-msgstr[1] "{0} itinerari, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto del percorso"
-msgstr[1] "{0} punti del percorso"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10466,10 +10555,10 @@
 "tracciati, vedere qui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10480,7 +10569,7 @@
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10488,10 +10577,10 @@
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10499,10 +10588,10 @@
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10510,21 +10599,21 @@
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Scarica vicino:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "solo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "solo punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "tracciato e punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10536,9 +10625,9 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10549,5 +10638,5 @@
 "all''inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10557,30 +10646,30 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Usa le impostazioni globali."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Disegna le linee tra i punti di questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Non disegnare le linee tra i punti di questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Seleziona le opzioni per il disegno delle linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10588,5 +10677,5 @@
 msgstr "Personalizza colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10595,5 +10684,5 @@
 msgstr "Predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10602,18 +10691,18 @@
 msgstr "Scegli un colore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Crea marcatori dai punti con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nomina i punti del percorso da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importa l''audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10626,23 +10715,23 @@
 "possibile correlarli con la traccia audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Importazione non possibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Files audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -11103,15 +11192,15 @@
 msgstr "Il file dell''immagine non può essere eliminato."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Nessuna immagine"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Caricamento {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -12195,4 +12284,48 @@
 msgid "Voice recorder calibration"
 msgstr "Calibrazione del registratore vocale"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Intervallo di aggiornamento (in giorni):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Il valore di default è ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Una volta salvato, mantieni i file di backup che finiscono con ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Copia di riserva del file"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Configura se creare delle copie di riserva dei file"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12277,5 +12410,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Automobile"
@@ -12294,16 +12427,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicicletta"
@@ -12337,12 +12470,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Pedone"
@@ -12403,5 +12536,5 @@
 msgctxt "gpx_field"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. gpx data field name
@@ -12409,5 +12542,5 @@
 msgctxt "gpx_field"
 msgid "Desc(ription)"
-msgstr ""
+msgstr "Desc(rizione)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
@@ -12614,18 +12747,18 @@
 msgstr "Predefinita (determinata automaticamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Abilita lo stile predefinito ''incorporato''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Abilita le icone predefinite incorporate"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Stile usato"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Stili di disegno della mappa"
@@ -12979,28 +13112,20 @@
 "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Impostazioni proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Copia di riserva del file"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 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 "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
@@ -13119,6 +13244,15 @@
 "da<br>''''{0}''''.<br><br>Dettagli (non tradotti):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "Strumenti esterni"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13380,12 +13514,4 @@
 "autenticazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Mantieni i file di backup"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Una volta salvato, mantieni i file di backup che finiscono con ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13595,5 +13721,5 @@
 msgstr "Aggiungi una nuova etichetta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13604,49 +13730,49 @@
 "display_values deve essere lo stesso di values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Ulteriori informazioni su questa caratteristica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Requisito sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Ruoli disponibili"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "conteggio"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "elementi"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Attributi opzionali:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "Elemento ruolo preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "Sotto-elemento preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13656,15 +13782,15 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13674,17 +13800,17 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -14348,5 +14474,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14462,5 +14588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14469,5 +14595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14546,5 +14672,5 @@
 msgstr "il file \"{0}\" non esiste"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14556,5 +14682,5 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
@@ -14563,5 +14689,5 @@
 "dell''elemento <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14569,5 +14695,5 @@
 msgstr "Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14577,5 +14703,5 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14583,5 +14709,5 @@
 msgstr "Il percorso eliminato {0} contiene dei nodi"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -14590,5 +14716,5 @@
 "dell''elemento <relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14596,5 +14722,5 @@
 msgstr "Attributo ''''ref'''' mancante sul membro nella relazione {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14604,5 +14730,5 @@
 "{0}. Ottenuto {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14610,5 +14736,5 @@
 msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14619,10 +14745,10 @@
 "relazione {1}. Ottenuto {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "<member> incompleto, specificazione con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14630,9 +14756,9 @@
 msgstr "La relazione eliminata {0} contiene dei membri"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "Chiave o valore dell''attributo mancante nell'etichetta."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14642,11 +14768,11 @@
 "ingresso. Omesso."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Oggetto illegale con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14660,8 +14786,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14677,5 +14803,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14683,5 +14809,5 @@
 msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14690,6 +14816,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14703,6 +14829,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14711,5 +14837,5 @@
 msgstr "Valore non valido per l''attributo ''''changeset''''. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14717,5 +14843,5 @@
 msgstr "Manca l''attributo obbligatorio ''''{0}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14724,5 +14850,5 @@
 "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
@@ -14733,5 +14859,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14739,5 +14865,5 @@
 msgstr "Il nodo eliminato {0} fa parte del percorso {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14749,5 +14875,5 @@
 "non è presente nei dati caricati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14759,5 +14885,5 @@
 "con ID esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14765,17 +14891,17 @@
 msgstr "il membro eliminato {0} è utilizzato dalla relazione {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Analisi dei dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Preparazione dell''insieme di dati..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15339,11 +15465,11 @@
 msgstr "Scarica la lista delle estensioni..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Scaricamento della lista delle estensioni da ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15355,16 +15481,16 @@
 "''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Scrittura della lista delle estensioni su file locale ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Analisi della lista delle estensioni dal sito ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15375,5 +15501,5 @@
 "ignorato. L''eccezione è stata: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15394,13 +15520,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Non fare niente"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Segnala bug"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15412,9 +15538,9 @@
 "prega gentilmente di effettuare una segnalazione per questo problema."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Eccezione inattesa"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -15425,5 +15551,5 @@
 "versione che si trova qui:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -15434,5 +15560,5 @@
 "utilizzando questo collegamento:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15444,5 +15570,5 @@
 "maggior numero di dettagli possibile."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -15452,9 +15578,9 @@
 "manualmente su questo indirizzo URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Il testo è stato già copiato nei tuoi appunti)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Ci si è imbattuti in un bug di JOSM"
@@ -15716,5 +15842,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15779,5 +15905,5 @@
 msgstr "inutilizzato"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15791,5 +15917,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15799,5 +15925,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15808,5 +15934,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
@@ -15929,5 +16055,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Visibilità"
@@ -16014,10 +16140,62 @@
 msgstr "Carica i tracciati su openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Orario di apertura"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Cambia le proprietà di al massimo {0} oggetto"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Scegliere"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Percorso {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Strumenti: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Errore nel filtro"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "aperto"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -16197,59 +16375,60 @@
 msgstr "Allinea percorsi"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"Non è possibile allineare dei segmenti connessi.\n"
-"Si prega di selezionare due segmenti che non condividono alcun nodo."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "Messaggio AlignWayS"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"L''allineamento posizionerebbe i nodi al di fuori dei limiti cartografici.\n"
+"L''azione è stata annullata."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Sono pronto!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "Suggerimenti AlignWays"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Modalità di allineamento percorsi"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Segmento di allineamento percorso"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "il parametro ''{0}'' non deve essere nullo"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"Il segmento da allineare non può essere lo stesso del segmento di "
+"riferimento.\n"
+"Si prega di selezionare un segmento da allineare differente."
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
 msgstr "Messaggio AlignWayS"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"L''allineamento posizionerebbe i nodi al di fuori dei limiti cartografici.\n"
-"L''azione è stata annullata."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Sono pronto!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "Suggerimenti AlignWays"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "Modalità di allineamento percorsi"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "Segmento di allineamento percorso"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"Il segmento da allineare non può essere lo stesso del segmento di "
-"riferimento.\n"
-"Si prega di selezionare un segmento da allineare differente."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -16412,28 +16591,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Allineare i segmenti.</b> Premere <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. In alternativa si può usare il comando presente "
-"nel menu <b>Strumenti</b>\n"
-" oppure si può aggiungere l''azione alla <b>barra degli strumenti</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -16455,5 +16614,5 @@
 "\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "Non mostrare nuovamente"
@@ -16566,5 +16725,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Edifici"
@@ -16820,5 +16979,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -17269,8 +17428,4 @@
 msgstr "Est"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Nord"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -17394,6 +17549,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Livello vuoto"
@@ -18798,5 +18953,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
@@ -18840,36 +18995,41 @@
 msgstr "Tracciati"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Punti del percorso"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "carica dati dalle API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "dati importati da {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "crea nuovi oggetti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "cambia la selezione"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "cambia la visualizzazione"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr "leggi la versione del protocollo"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "conferma manualmente tutte le azioni di controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
@@ -18877,13 +19037,13 @@
 "applicazioni."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Preferenze per l''estensione di controllo remoto."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18895,21 +19055,21 @@
 "applicazioni esterne che devono dialogare con l''estensione."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Azioni permesse"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Si vuole permettere questo?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Conferma l''azione del controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "il controllo remoto ha richiesto la creazione di un nuovo nodo."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18917,14 +19077,14 @@
 "indirizzo URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Dettagli della richiesta: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -19154,58 +19314,58 @@
 msgstr "Elimina i nodi non necessari di un'area"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Ingrandimento automatico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Mostra informazioni sul tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Carica tutti i tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Aumenta l''ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Diminuisci l''ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Blocca alla dimensione del tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Svuota la cache dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "immagine "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "ingrandimento automatico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "carica automaticamente i tasselli"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Impostazioni per l''estensione SlippyMap"
@@ -19497,11 +19657,10 @@
 msgstr "Complesso"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Modifica conduttura"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr "Modifica OpenSeaMap"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr "Editor delle caratteristiche nautiche"
@@ -20690,5 +20849,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -20815,59 +20974,59 @@
 msgstr "Percorsi sovrapposti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "Validatore di relazioni :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Questa estensione cerca gli errori nelle relazioni."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Tipo di relazione sconosciuto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "Relazione vuota"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<vuoto>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "Ruolo {0} mancante"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Problema nella verifica del ruolo"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "Numero di ruoli {0} troppo basso ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "Numero di ruoli {0} troppo alto ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "Membro per ruolo {0} di tipo errato"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "Ruolo {0} sconosciuto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "Trovato ruolo vuoto"
@@ -21381,144 +21540,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% della traccia GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Visualizza la posizione corrente nel video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Importa video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Sincronizza un video su questa traccia GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Rimuovi video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "Rimuovi il video corrente dal livello"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "play/pausa"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "Inizia/ferma la riproduzione video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "Indietro"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr "salta n secondi indietro"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "dosso"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr "vai a"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+msgstr "si posiziona in corrispondenza dell''ora gps inserita"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Si prega di inserire un indice di tassello"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "si prega di inserire l''ora GPS"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "avanti"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr "salta n secondi avanti"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "più veloce"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "aumenta velocità riproduzione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "più lento"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "diminuisce velocità riproduzione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "ripeti"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr "ripete per n secondi in prossimità della posizione corrente"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Mantieni centrato"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "segui l'icona del video automaticamente"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Scaletta"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr "Sottotitoli"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Visualizza la posizione corrente nel video"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr "Visualizza i sottotitoli nel video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Lunghezza salto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Imposta la lunghezza del salto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "Salta il video per x ms"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Lunghezza ripetizione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Imposta la lunghezza in corrispondenza di un punto di ripetizione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr "non deinterlacciare"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr "Deinterlacciamento con raddoppio linea"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr "deinterlacciamento con interpolazione lineare"
@@ -21538,7 +21693,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "multiplo"
+msgstr "muto"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21650,16 +21804,16 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Seleziona i risultati della ricerca della stringa"
+msgstr "Seleziona un punto del percorso per muovere la mappa"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Punti del percorso"
+msgstr "Ricerca punto del percorso"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
+"Ricerca punto del percorso successivo. Cliccare e muovere la mappa in "
+"corrispondenza del punto del percorso."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
@@ -21672,9 +21826,9 @@
 msgstr "Seleziona le sequenze di percorsi non ramificate"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "E'' stata generata una eccezione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Non in cache"
@@ -21735,21 +21889,21 @@
 msgstr "Regola la posizione del livello WMS selezionato"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Selezionare il livello WMS da regolare."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Seleziona il livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Inizia la regolazione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Non c''è al momento alcun livello WMS da regolare."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Nessun livello da regolare"
@@ -21760,5 +21914,5 @@
 msgstr "Scarica il tassello WMS da {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21769,5 +21923,5 @@
 "''&'' o ''?''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21777,10 +21931,10 @@
 "Verificare le proprie impostazioni."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Attenzione: l''indirizzo URL completo è ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21791,5 +21945,5 @@
 "Potrebbero essere presenti errori nelle coordinate."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21798,9 +21952,9 @@
 "non corretto ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(disattivato)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
@@ -21808,10 +21962,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21827,17 +21981,17 @@
 "WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Si, preleva le immagini"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Indirizzo URL non valido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21846,58 +22000,83 @@
 "visuale, oppure di cambiare la risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Ricarica i tasselli non corretti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Imposta segnalibro WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Scaricamento automatico"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Impossibile trovare l''oggetto della mappa."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Apri un livello WMS vuoto per caricare i dati da file"
@@ -21964,12 +22143,11 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
 msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
+msgstr "Abilita controllo remoto (richiede l''estensione remotecontrol)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"Il controllo remoto ha richiesto l''importazione dei dati dal seguente "
+"Remote Control ha richiesto il caricamento di un livello WMS dal seguente "
 "indirizzo URL:"
 
@@ -22503,16 +22681,21 @@
 "Java - tablet)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Visualizza una immagine di sfondo OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22522,5 +22705,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22530,5 +22713,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22539,5 +22722,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22548,10 +22731,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22561,15 +22744,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Estensione per il ripristino dei gruppi di modifiche"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22583,5 +22766,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22593,10 +22776,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22608,5 +22791,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22617,15 +22800,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22639,15 +22822,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22659,5 +22842,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22668,5 +22851,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22677,10 +22860,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22692,5 +22875,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22703,5 +22886,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22713,5 +22896,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22719,15 +22902,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
+msgstr "Abilita la ricerca di un punto del percorso importato da un file gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Seleziona una sequenza di percorsi connessi non ramificati"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22738,5 +22921,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22780,4 +22963,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22810,10 +22994,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Strade"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Strade"
@@ -22824,5 +23008,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autostrada/tangenziale"
@@ -22831,5 +23015,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Modifica autostrada/tangenziale"
@@ -22866,10 +23050,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Riferimento"
@@ -22883,8 +23067,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Corsie"
@@ -22903,13 +23087,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -22943,17 +23127,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Senso unico"
@@ -22990,17 +23174,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -23034,17 +23218,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -23075,17 +23259,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -23116,17 +23300,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -23134,5 +23318,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Collegamento autostradale"
@@ -23141,5 +23325,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Modifica collegamento autostradale"
@@ -23147,5 +23331,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Trunk"
@@ -23154,5 +23338,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Modifica Trunk"
@@ -23162,6 +23346,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Superstrada"
@@ -23169,5 +23353,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -23176,5 +23360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Modifica Trunk Link"
@@ -23187,5 +23371,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primaria"
@@ -23194,5 +23378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Modifica strada primaria"
@@ -23200,10 +23384,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Svincolo primario"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Modifica svincolo primario"
@@ -23215,5 +23399,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondaria"
@@ -23223,5 +23407,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Modifica strada secondaria"
@@ -23229,5 +23413,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Terziaria"
@@ -23237,5 +23421,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Modifica strada terziaria"
@@ -23247,5 +23431,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -23255,5 +23439,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Modifica una strada unclassified"
@@ -23263,6 +23447,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Slarghi per l''incrocio"
@@ -23285,15 +23469,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -23305,5 +23489,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Strada residenziale"
@@ -23312,5 +23496,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Modifica strada residenziale"
@@ -23330,12 +23514,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Superficie"
@@ -23357,166 +23541,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "pavimentata"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "non pavimentata"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalto"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "calcestruzzo"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metallo"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "bosco"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "lastricato"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "ghiaia"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "ciottoli"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "compattato"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "erba"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "erba"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sabbia"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "terra"
@@ -23524,5 +23708,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Living Street"
@@ -23531,5 +23715,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Modifica Living Street"
@@ -23537,5 +23721,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Area pedonale"
@@ -23544,5 +23728,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Modifica area pedonale"
@@ -23550,5 +23734,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Strada di servizio"
@@ -23557,5 +23741,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Modifica strada di servizio"
@@ -23565,18 +23749,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Tipo di strada di servizio"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "vicolo"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "strada di servizio"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "corsia interna a parcheggio"
@@ -23584,5 +23768,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Corsia interna a parcheggio"
@@ -23592,10 +23776,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Modifica corsia interna a parcheggio"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
@@ -23604,5 +23788,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
@@ -23610,14 +23794,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Modifica una strada in costruzione"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Svincolo"
@@ -23633,5 +23817,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rotatoria"
@@ -23640,5 +23824,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
@@ -23647,15 +23831,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Pedaggio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
@@ -23663,5 +23847,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Permesso di accesso"
@@ -23687,4 +23871,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23692,4 +23877,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23765,236 +23956,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privato"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permesso"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "Agricolo"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "forestale"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "carico e scarico"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "no"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Agricolo"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "specifico"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privato"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permesso"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "Agricolo"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "forestale"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "carico e scarico"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "no"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Agricolo"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "specifico"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "ufficiale"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
@@ -24009,10 +24207,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Cavallo"
@@ -24028,10 +24226,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocicletta"
@@ -24046,19 +24245,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automobile"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicoli di servizio pubblico"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
@@ -24066,20 +24265,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
@@ -24087,5 +24286,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -24096,5 +24295,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
@@ -24114,10 +24313,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada/tangenziale"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "collegamento autostradale"
@@ -24139,10 +24338,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -24164,10 +24363,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primaria"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "svincolo primario"
@@ -24189,5 +24388,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -24202,9 +24401,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "terziaria"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "unclassified"
@@ -24218,9 +24417,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "residenziale"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "living_street"
@@ -24264,10 +24463,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "strada di servizio"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "autobus guidato"
@@ -24297,5 +24496,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -24307,10 +24506,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
@@ -24318,10 +24517,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Percorsi"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Track"
@@ -24330,35 +24529,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Modifica Track"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Tipo di traccia"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "grado1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "grado2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "grado3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "grado4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "grado5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Scala di classificazione MTB"
@@ -24366,5 +24565,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Percorso"
@@ -24373,76 +24572,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Modifica percorso"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Scala escursionistica SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "escursionismo alpino"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "escursionisti esperti"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "sentiero alpino"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "sentiero alpino impegnativo"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "sentiero alpino difficile"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "eccellente"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "buona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "cattiva"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "orribile"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Sedie a rotelle"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Sci"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Motoslitta"
@@ -24451,5 +24650,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Percorso dedicato all''equitazione"
@@ -24457,5 +24656,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Modifica un percorso per equitazione"
@@ -24463,5 +24662,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Pista ciclabile dedicata"
@@ -24479,11 +24678,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Modifica Cycleway"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Pedoni"
@@ -24491,5 +24690,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Pista pedonale separata e ciclabile"
@@ -24497,5 +24696,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Pista combinata pedonale e ciclabile"
@@ -24503,5 +24702,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Marciapiede Dedicato"
@@ -24510,5 +24709,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Modifica Footway"
@@ -24516,5 +24715,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -24524,10 +24723,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Quantità di posti"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Svincolo autostradale"
@@ -24535,15 +24740,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Modifica svincolo autostradale"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Numero"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Stazione di servizio"
@@ -24551,5 +24756,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Modifica stazione di servizio"
@@ -24557,10 +24762,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -24589,36 +24795,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operatore"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Ripristina"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Modifica ristorante"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Telefono di emergenza"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -24628,5 +24855,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
@@ -24635,27 +24862,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "non presidiato"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "Semaforo"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "isola spartitraffico"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "non marcato"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Attraversamento a cavallo"
@@ -24663,6 +24890,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Attraversamento ciclabile"
@@ -24671,11 +24898,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
@@ -24683,30 +24910,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "strisce pedonali"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "attraversamento pedonale regolato da semaforo"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -24714,67 +24941,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Attraversamento pedonale"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Modifica attraversamento pedonale"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Nome del tipo (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Rallentatore del traffico"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Modifica rallentatore del traffico"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "dosso"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "chicane"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "restringimento"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "cuscino berlinese"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "dosso lungo"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "dosso piatto"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Slargo per l''incrocio"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Modifica slargo per l''incrocio"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "mini-rotatoria"
@@ -24785,14 +24950,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "senso orario"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Attraversamento pedonale"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Modifica attraversamento pedonale"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Nome del tipo (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Rallentatore del traffico"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Modifica rallentatore del traffico"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "dosso"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "chicane"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "restringimento"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "cuscino berlinese"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "dosso lungo"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "dosso piatto"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Slargo per l''incrocio"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Modifica slargo per l''incrocio"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
@@ -24802,5 +25029,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Cartello di inizio/fine di centro abitato"
@@ -24808,15 +25035,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Modifica cartello di inizio/fine di centro abitato"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Rilevatore di velocità"
@@ -24825,11 +25052,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Telefono di emergenza"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Rampa"
@@ -24837,5 +25059,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Rampa ripida"
@@ -24843,5 +25065,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Cassone di sabbia"
@@ -24851,10 +25073,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Guado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Modifica guado"
@@ -24862,5 +25084,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -24868,5 +25090,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
@@ -24875,10 +25097,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Elevazione"
@@ -24886,5 +25108,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barriere"
@@ -24892,5 +25114,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Colonnina"
@@ -24898,5 +25120,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
@@ -24941,16 +25163,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
@@ -24959,5 +25181,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Blocco"
@@ -24965,5 +25187,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -24971,10 +25193,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -24982,15 +25204,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -24998,5 +25220,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
@@ -25004,10 +25226,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -25016,5 +25238,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Siepe"
@@ -25025,22 +25247,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Recinto"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "recinzione"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "recinto in legno"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "recinto in rete"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Muro"
@@ -25048,5 +25270,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -25055,5 +25277,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
@@ -25064,10 +25286,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
@@ -25075,5 +25297,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Cancello"
@@ -25081,50 +25303,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Scaletta"
@@ -25132,25 +25354,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Tornello"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Modifica tornello"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
@@ -25158,25 +25380,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Sorgente"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Modifica sorgente"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -25184,10 +25395,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Fosso"
@@ -25195,10 +25406,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Modifica fosso"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Torrente"
@@ -25206,10 +25417,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Canale"
@@ -25217,10 +25428,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Fiume"
@@ -25230,59 +25441,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Modifica un fiume"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Sorgente"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Modifica sorgente"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Cascata"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Modifica una cascata"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Sbarramento"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Modifica sbarramento"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Diga"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Modifica una diga"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Bacino"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Modifica area di bacino"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Serbatoio"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Modifica area di riserva d''acqua"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Bacino coperto"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Modifica bacino coperto"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Terraferma"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Modifica terraferma"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Bacino"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Modifica area di bacino"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Serbatoio"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Modifica area di riserva d''acqua"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Bacino coperto"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Modifica bacino coperto"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Linea di costa"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Modifica linea di costa"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Argine"
@@ -25291,10 +25556,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Zona umida"
@@ -25305,14 +25571,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "torbiera"
@@ -25326,35 +25592,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Spiaggia"
@@ -25362,20 +25628,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Baia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Rupe"
@@ -25383,145 +25649,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Linea di costa"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Modifica linea di costa"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Acquisti"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Terminal traghetti"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Modifica terminal traghetti"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Automobile"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "principante"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicicletta"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Itinerario traghetto"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Cantiere navale"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Modifica cantiere navale"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Darsena/bacino navale"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Modifica una darsena/bacino navale"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Diga"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Modifica una diga"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Nautica"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Porto turistico"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Modifica un porto turistico"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Passerella"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Modifica passerella"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Sbarramento"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Modifica sbarramento"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Cascata"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Modifica una cascata"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Porto turistico"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Modifica un porto turistico"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Passerella"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Modifica passerella"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Terminal traghetti"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Modifica terminal traghetti"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -25531,16 +25868,38 @@
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Cantiere navale"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Modifica cantiere navale"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Darsena/bacino navale"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Modifica una darsena/bacino navale"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Trasporto"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Ferrovia"
@@ -25548,5 +25907,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -25576,7 +25935,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Scartamento (mm)"
@@ -25592,8 +25951,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Tipi"
@@ -25607,29 +25966,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "tratto per una società o ente"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elettrificato"
@@ -25642,8 +26001,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "linea aerea"
@@ -25714,8 +26073,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25727,8 +26086,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Tensione"
@@ -25741,8 +26100,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frequenza (Hz)"
@@ -25755,23 +26114,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -25779,50 +26138,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Autobus guidato"
@@ -25830,5 +26189,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Modificare autobus guidato"
@@ -25837,10 +26196,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
@@ -25849,9 +26208,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Tipi opzionali"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -25860,5 +26219,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -25867,5 +26226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Attraversamento"
@@ -25875,5 +26234,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -25881,5 +26240,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -25888,5 +26247,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Respingente"
@@ -25895,10 +26254,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -25906,10 +26265,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -25917,10 +26276,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Funivia"
@@ -25928,10 +26287,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Modifica funivia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Cabinovia/Ovovia"
@@ -25939,10 +26298,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia/ovovia"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25951,5 +26311,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25957,5 +26317,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25964,5 +26324,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25970,5 +26330,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -25978,69 +26338,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "terraferma"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indipend."
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -26057,34 +26440,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -26092,37 +26476,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Orario di apertura"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -26143,33 +26538,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -26178,170 +26575,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr ""
-
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+msgstr "Ma-Do 08:00-15:00;Sa 08:00-12:00"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "Con chiosco"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Minimarket"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Chiosco"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Tipi di carburante:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel per veicoli di trasporto merci pesanti"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 ottani"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 ottani"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 ottani"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 ottani"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (miscela 10% etanolo)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (miscela 85% etanolo)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gas di petrolio liquefatto)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNC (gas naturale compresso)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr "Miscela 1/25 (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "Miscela 1/50 (mofa/moped)"
@@ -26349,4 +26768,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -26358,6 +26778,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parcheggio"
@@ -26366,5 +26786,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -26375,25 +26795,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "superficie"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Parcheggio di interscambio"
@@ -26402,54 +26824,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Tariffa"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Capacità (totale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Spazi per le donne"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Spazi per gli elementi da cui dipende"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Concessionaria"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Modifica concessionaria"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Tipi"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Modifica albero singolo"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Contenuto"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Numero di telefono"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Numero di fax"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Sito Web"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Indirizzo email"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Noleggio"
@@ -26458,10 +27024,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Condivisione"
@@ -26469,28 +27034,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Modifica parcheggio per biciclette"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacità"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocicletta"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Modifica autostrada/tangenziale"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Stazione di servizio"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Ridimensiona"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "cattiva"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Preimpostati"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Vestiti"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacità"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Negozio di biciclette"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Modifica negozio di biciclette"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -26500,5 +27124,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -26506,5 +27130,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -26512,5 +27136,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -26518,5 +27142,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -26524,5 +27148,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -26531,5 +27155,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -26537,5 +27161,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -26544,5 +27168,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -26554,5 +27178,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -26560,10 +27184,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -26572,10 +27196,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -26584,5 +27208,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -26591,5 +27215,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -26597,5 +27221,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Fermata dell''autobus"
@@ -26605,13 +27229,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Modifica fermata dell''autobus"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -26619,19 +27242,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Panchina"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Pavimentazione tattile"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -26639,5 +27262,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -26645,5 +27268,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -26651,10 +27274,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aeroporto"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Terreno aeroportuale"
@@ -26662,5 +27285,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Modifica terreno aeroportuale"
@@ -26668,10 +27291,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -26680,5 +27303,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Pista di decollo/atterraggio"
@@ -26686,5 +27309,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Modifica pista di decollo/atterraggio"
@@ -26692,5 +27315,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Pista di rullaggio"
@@ -26698,5 +27321,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Modifica pista di rullaggio"
@@ -26704,5 +27327,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Eliporto"
@@ -26710,5 +27333,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Modifica eliporto"
@@ -26718,5 +27341,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Parcheggio aeromobili"
@@ -26726,5 +27349,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -26735,6 +27358,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Torre radio"
@@ -26744,5 +27367,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Manica a vento"
@@ -26751,5 +27374,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminale"
@@ -26757,5 +27380,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Modifica terminal aeroportuale"
@@ -26763,15 +27386,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Modifica varco terminal aeroportuale"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Viaggio"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -26783,5 +27406,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -26790,5 +27413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
@@ -26801,8 +27424,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stelle"
@@ -26826,36 +27449,36 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "Accesso ad Internet"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "wlan"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
-msgstr ""
+msgstr "via cavo"
 
 #. color aeroway
@@ -26867,168 +27490,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal aeroportuale"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
-msgstr ""
+msgstr "Tariffa di accesso ad Internet"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "Zona fumatori"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "dedicata"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "separata"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
-msgstr ""
-
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Numero di telefono"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr "Numero di fax"
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr "Sito Web"
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr "Indirizzo email"
+msgstr "isolata"
 
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -27036,20 +27564,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -27057,10 +27585,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Ostello"
@@ -27068,30 +27596,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -27099,10 +27628,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -27113,5 +27642,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -27119,5 +27648,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -27125,5 +27654,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cucina"
@@ -27131,79 +27662,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "francese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "tramezzino"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr "Microbirreria"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast food"
@@ -27211,29 +27742,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "fish-and-chips"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "pollo"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
-msgstr ""
+msgstr "Mensa self service"
 
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
-msgstr ""
+msgstr "Modifica mensa self service"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -27241,10 +27772,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -27252,20 +27788,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -27273,10 +27809,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -27284,25 +27820,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museo"
@@ -27310,9 +27846,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -27321,9 +27857,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Parco divertimenti"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Modifica parco divertimenti"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Opera d''arte"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Modifica opera d''arte"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -27331,50 +27888,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Parco divertimenti"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Modifica parco divertimenti"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Opera d''arte"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Modifica opera d''arte"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Modifica pensilina/ricovero"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Caminetto"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Area picnic"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Modifica area picnic"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topografico"
@@ -27412,5 +27970,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -27418,28 +27976,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "provincia"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -27449,5 +28007,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Itinerari segnalati per:"
@@ -27455,5 +28013,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -27461,6 +28019,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -27468,5 +28026,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -27474,6 +28032,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Sci"
@@ -27481,5 +28039,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Equitazione"
@@ -27487,46 +28045,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr "Pennone"
@@ -27535,5 +28093,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -27541,55 +28099,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Modifica pensilina/ricovero"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Caminetto"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Area picnic"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Modifica area picnic"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Castello"
@@ -27598,19 +28135,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -27619,9 +28156,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -27629,10 +28166,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -27640,5 +28177,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
@@ -27646,15 +28183,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Memoriale"
@@ -27662,55 +28199,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Parco giochi"
@@ -27718,35 +28255,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -27760,6 +28297,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -28175,6 +28712,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -28209,240 +28746,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "tiro con l''arco"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "football americano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "calcio canadese"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "sport equestri"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "calcio gaelico"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "rugby a 13"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "rugby a 15"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Discipline sportive"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -28459,5 +28996,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -28484,23 +29020,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tipo"
@@ -28517,5 +29061,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -28542,211 +29085,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "campo sportivo"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "centro sportivo"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Sport motoristici"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Modifica Sport Motoristici"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -28754,52 +29300,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -28807,204 +29353,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Discipline sportive (palla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "Football americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "Modifica football americano"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "Calcio canadese"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "Modifica calcio canadese"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "Calcio gaelico"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "Modifica calcio gaelico"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "Rugby a 13 (rugby league)"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr "Modifica rugby a 13 (rugby league)"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "Rugby a 15 (rugby union)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "Modifica rugby a 15 (rugby union)"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Sport motoristici"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Modifica Sport Motoristici"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Attenzione"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Modifica parcheggio"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Automobili"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Modifica Sport Motoristici"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Modificare Pattinaggio"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Modifica dogana"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Automobile"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Modifica funivia"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Palazzo"
@@ -29012,5 +29624,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -29018,10 +29630,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Municipio"
@@ -29029,10 +29641,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -29040,10 +29652,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -29052,10 +29664,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Prigione"
@@ -29064,10 +29676,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polizia"
@@ -29077,10 +29689,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -29089,10 +29701,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -29100,5 +29712,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -29106,15 +29718,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Scuola"
@@ -29122,10 +29734,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Modifica scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Università"
@@ -29133,10 +29745,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Scuola superiore"
@@ -29144,5 +29756,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
@@ -29150,5 +29762,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cinema"
@@ -29157,10 +29769,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Biblioteca"
@@ -29169,9 +29781,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -29179,10 +29791,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d''arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teatro"
@@ -29191,10 +29803,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -29204,5 +29816,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -29211,6 +29823,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religione"
@@ -29219,66 +29831,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "Zoroastrista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Denominazione"
@@ -29287,189 +29899,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "Sunnita"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Indirizzi"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Modifica dati indirizzo"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Numero civico"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nome Casa"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nome Strada"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Nome città"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Codice postale"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Codice nazione"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Modifica interpolazione indirizzo"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Schema numerazione"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "dispari"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "pari"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabetico"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -29477,25 +30019,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Faro"
@@ -29503,10 +30045,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -29514,10 +30056,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -29526,41 +30068,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Posizione"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -29570,10 +30112,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Gru permanente"
@@ -29581,5 +30123,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
@@ -29587,10 +30129,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -29598,10 +30140,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -29609,23 +30151,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "interno"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "esterno"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "pubblico"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -29635,35 +30177,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -29672,10 +30214,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -29684,5 +30226,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -29690,10 +30232,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Riferimento elettrodotto"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -29704,23 +30246,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Elettrodotto"
@@ -29729,20 +30271,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Modifica elettrodotto"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr "elettrodotto"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29750,55 +30292,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "singolo"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "doppio"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "quadruplo"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limitato"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefono"
@@ -29807,5 +30349,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -29813,5 +30355,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Monete"
@@ -29819,11 +30361,11 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
-msgstr "Note"
+msgstr "Banconote"
 
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -29831,5 +30373,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -29837,15 +30379,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -29854,5 +30396,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -29860,35 +30402,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Lattine"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Vestiti"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Cestino della spazzatura"
@@ -29896,5 +30433,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Modifica cestino della spazzatura"
@@ -29903,31 +30440,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marrone"
@@ -30006,5 +30543,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -30014,31 +30551,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -30046,31 +30583,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontana"
@@ -30079,10 +30616,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -30091,10 +30628,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Pompa antincendio"
@@ -30103,5 +30640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Modifica pompa antincendio"
@@ -30109,501 +30646,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Pedone"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermercato"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Modifica Supermercato"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Minimarket"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Modifica minimarket"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Chiosco"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Modifica chiosco"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Macellaio"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Modifica Macellaio"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Panificio"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Modifica Panificio"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Prodotti biologici"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Modifica negozio di prodotti biologici"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alcolici (non in Italia)"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Modifica negozio di alcolici (non in Italia)"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Bevande"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Modifica negozio di bevande"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Negozi"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Articoli di pulizia e bellezza"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Modifica negozio di articoli di pulizia e bellezza"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Parrucchiere/barbiere"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Modifica parrucchiere/barbiere"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Ottico"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Modifica Ottico"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Modifica negozio di informatica"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Calzature"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Modifica Negozio di Scarpe"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Sport all''aperto"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Modifica sport all''aperto"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Modifica articoli sportivi"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Lavanderia a secco"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Modifica Lavanderia a secco"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Lavanderia"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Modifica lavanderia"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "ferrovia (sopra)"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Modifica una ferrovia"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Modifica negozio di informatica"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elettronica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Modifica Negozio di Elettronica"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hi-Fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Modifica negozio di Hi-Fi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Videoteca"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Modifica videoteca"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Fiorista"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Modifica Fiorista"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Giardinaggio"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Modifica giardinaggio"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Ferramenta"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Modifica Negozio di Ferramenta"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Fai-da-te"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Modifica negozio Fai-da-te"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Mobilia"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Modifica Negozio di Mobilia"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Cartoleria"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Modifica cartoleria"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Libreria"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Modifica libreria"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Agenzia di viaggi"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Modifica agenzia di viaggi"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Giocattoli"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Modifica Negozio di Giocattoli"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Distributore automatico"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Modifica Distributore automatico"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Distributore automatico"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "biglietti per il trasporto pubblico"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "orari del trasporto pubblico"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "biglietti per il parcheggio"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "cibo"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "bevande"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "dolci"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "sigarette"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotografie"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "cibo per animali"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "giornali"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "giocattoli"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "francobolli"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "schede SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "ricariche telefoniche"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "buoni"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "camere d''aria per biciclette"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "preservativi"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "assorbenti"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "sacchetti per escrementi"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Conto o carta fedeltà"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Contanti"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banca"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Modifica banca"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Bancomat"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Cambiavalute"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Modifica cambiavalute"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Modifica bancomat"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Salute"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Ambulatorio"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Modifica ambulatorio"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dentista"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Modifica dentista"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Farmacia"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Modifica Farmacia"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Vendita medicinali con obbligo di prescrizione"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Ospedale"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Modifica Ospedale"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Negozi"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Concessionaria"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Modifica concessionaria"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Negozio di biciclette"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Modifica negozio di biciclette"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermercato"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Modifica Supermercato"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Articoli di pulizia e bellezza"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Modifica negozio di articoli di pulizia e bellezza"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Minimarket"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Modifica minimarket"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Chiosco"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Modifica chiosco"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Libreria"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Modifica libreria"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Agenzia di viaggi"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Modifica agenzia di viaggi"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Macellaio"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Modifica Macellaio"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Panificio"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Modifica Panificio"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Fiorista"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Modifica Fiorista"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Prodotti biologici"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Modifica negozio di prodotti biologici"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alcolici (non in Italia)"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Modifica negozio di alcolici (non in Italia)"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Bevande"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Modifica negozio di bevande"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Modifica negozio di informatica"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elettronica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Modifica Negozio di Elettronica"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hi-Fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Modifica negozio di Hi-Fi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Mobilia"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Modifica Negozio di Mobilia"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Giardinaggio"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Modifica giardinaggio"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Ferramenta"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Modifica Negozio di Ferramenta"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Fai-da-te"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Modifica negozio Fai-da-te"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Cartoleria"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Modifica cartoleria"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Parrucchiere/barbiere"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Modifica parrucchiere/barbiere"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Calzature"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Modifica Negozio di Scarpe"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Giocattoli"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Modifica Negozio di Giocattoli"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Videoteca"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Modifica videoteca"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Lavanderia a secco"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Modifica Lavanderia a secco"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Lavanderia"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Modifica lavanderia"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Sport all''aperto"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Modifica sport all''aperto"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Modifica articoli sportivi"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Ottico"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Modifica Ottico"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Distributore automatico"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Modifica Distributore automatico"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Distributore automatico"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "Biglietti trasporto pubblico"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "Orari trasporto pubblico"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "Biglietti per il parcheggio"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "Alimenti"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "Bevande"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "Dolci"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "Sigarette"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotografie"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "Cibo per animali"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "Giornali"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "giocattoli"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "francobolli"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "Schede SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "buoni_telefonici"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "buoni"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "camera d''aria per biciclette"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "preservativi"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "assorbenti"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "Sacchetto per escrementi"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Conto o carta fedeltà"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Contanti"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banca"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Modifica banca"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Bancomat"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Cambiavalute"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Modifica cambiavalute"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Modifica bancomat"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Salute"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Ambulatorio"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Modifica ambulatorio"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dentista"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Modifica dentista"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Farmacia"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Modifica Farmacia"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Vendita medicinali con obbligo di prescrizione"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Ospedale"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Modifica Ospedale"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -30612,5 +31151,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
@@ -30619,15 +31158,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -30635,5 +31174,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -30642,368 +31181,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Confini"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nazionale"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Modifica confine nazionale"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Amministrativo"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Modifica confine amministrativo"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civile"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Modifica confine civile"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politico"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Modifica confine politico"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parco nazionale"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Modifica Confine Parco Nazionale"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Luoghi"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continente"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Nazione"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Regione"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Modifica regione"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Provincia"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Città"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Modifica città"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Paese"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Modifica paese"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Quartiere"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Frazione"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Borgo"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Picco montuoso"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Modifica picco montuoso"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Ghiacciaio"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Modifica Ghiacciaio"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulcano"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Modifica vulcano"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Entrata di una grotta/caverna"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Modifica entrata di una grotta/caverna"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Isola"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Modifica isola"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Isoletta"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natura"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Albero"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Modifica albero singolo"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Nome Botanico"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Bosco"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Modifica bosco"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "Conifere"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "deciduo (caducifoglie)"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "Mista"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Foresta"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Modifica area di foresta"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Riserva naturale"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Modifica riserva naturale"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Entrata di una grotta/caverna"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Modifica entrata di una grotta/caverna"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Picco montuoso"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Modifica picco montuoso"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Ghiacciaio"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Modifica Ghiacciaio"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulcano"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Modifica vulcano"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Confini"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nazionale"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Modifica confine nazionale"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Amministrativo"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Modifica confine amministrativo"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civile"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Modifica confine civile"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politico"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Modifica confine politico"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parco nazionale"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Modifica Confine Parco Nazionale"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Ghiaione"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Modifica ghiaione"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Prato alpino"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Modifica prato alpino"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Boscaglia"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Modifica boscaglia"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Brughiera"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Modifica brughiera"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Albero"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Modifica albero singolo"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Nome Botanico"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Bosco"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Modifica bosco"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "Conifere"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "deciduo (caducifoglie)"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "Mista"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Foresta"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Modifica area di foresta"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Riserva naturale"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Modifica riserva naturale"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Ghiaione"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Modifica ghiaione"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Boscaglia"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Modifica boscaglia"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Prato alpino"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Modifica prato alpino"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Brughiera"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Modifica brughiera"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Aia"
@@ -31012,45 +31557,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -31059,25 +31604,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Village Green"
@@ -31085,10 +31630,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -31096,20 +31641,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -31117,5 +31662,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -31123,15 +31668,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -31139,9 +31684,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -31149,39 +31694,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -31189,15 +31734,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -31205,52 +31750,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Stazione"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Indirizzi"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Modifica dati indirizzo"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Numero civico"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nome Casa"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nome Strada"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Nome città"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Codice postale"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Codice nazione"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Modifica interpolazione indirizzo"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Schema numerazione"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "dispari"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "pari"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabetico"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Contenuto"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Aggiungi informazioni sull'autore"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Immagine"
 
 #. item "Relations/Multipolygon"
@@ -31258,5 +31936,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -31268,5 +31946,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "segmento esterno"
@@ -31274,5 +31952,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "segmento interno"
@@ -31280,5 +31958,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Confine"
@@ -31289,5 +31967,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Modifica confine"
@@ -31295,36 +31973,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Tipo di confine"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "amministrativo"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "nazionale"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "civile"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "circoscrizione elettorale"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Livello amministrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Sotto-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Centro amministrativo"
@@ -31332,5 +32010,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -31339,5 +32017,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -31345,34 +32023,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -31381,15 +32059,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "verso il percorso"
@@ -31397,5 +32075,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Itinerario"
@@ -31404,5 +32082,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Modifica un itinerario"
@@ -31410,132 +32088,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Tipo di itinerario"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicicletta"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "sci"
@@ -31603,5 +32170,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31611,9 +32178,9 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "deviazione"
@@ -31627,10 +32194,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -31638,31 +32205,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Stato dell''itinerario"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -31671,30 +32238,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "segmento di itinerario"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -35672,7 +36239,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr "Landsat (mirror)"
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35794,8 +36360,48 @@
 msgstr "Sicilia - Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 - Italia"
+
+#~ msgid "Keep backup files"
+#~ msgstr "Mantieni i file di backup"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "Non è possibile allineare dei segmenti connessi.\n"
+#~ "Si prega di selezionare due segmenti che non condividono alcun nodo."
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Allineare i segmenti.</b> Premere <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. In alternativa si può usare il comando "
+#~ "presente nel menu <b>Strumenti</b>\n"
+#~ " oppure si può aggiungere l''azione alla <b>barra degli strumenti</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Nautica"
 
 #~ msgid "No data imported."
@@ -35958,7 +36564,4 @@
 #~ 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)"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 22859)
+++ applications/editors/josm/i18n/po/ja.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-19 03:56+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-27 03:36+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -97,5 +97,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "警告"
@@ -124,9 +124,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMapエディタ"
@@ -134,5 +134,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -256,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -281,5 +281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -304,5 +304,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -415,4 +415,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -430,5 +431,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1052,5 +1053,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1059,5 +1060,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1070,5 +1071,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1464,13 +1465,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "消去"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1479,5 +1480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1485,9 +1486,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "選択に追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1497,5 +1498,5 @@
 "い。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Undo/Redo バッファをクリア"
@@ -1529,8 +1530,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1539,9 +1540,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1557,6 +1558,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1566,5 +1567,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1589,6 +1590,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "エラー"
@@ -1749,5 +1750,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "いいえ、異常終了します"
@@ -2028,5 +2029,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2185,5 +2186,5 @@
 msgctxt "audio"
 msgid "Jump forward"
-msgstr "一つ進む"
+msgstr "次にジャンプ"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
@@ -2228,5 +2229,5 @@
 msgctxt "audio"
 msgid "Slower Forward"
-msgstr "ゆっくり再生"
+msgstr "ゆっくり進む"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
@@ -2498,5 +2499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2539,9 +2540,9 @@
 "本当に移動しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2550,9 +2551,9 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2835,5 +2836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "検索"
@@ -3038,7 +3039,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3304,5 +3305,5 @@
 msgstr[0] "{0} 個のノードを移動"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3457,31 +3458,31 @@
 msgstr "自動タグ修正"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr "ディレクトリ {0}を作成することができません。自動保存は無効となります。"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "ファイル {0}を作成することができません。他のファイル名が使用されます。"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "ファイル作成中にIOエラーが発生、自動保存はスキップされます: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "古いバックアップファイル{0}が削除できません。"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "次の削除済みレイヤのバックアップ作成中にエラー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3500,15 +3501,15 @@
 msgstr "不正な経度の値 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告: プリセットの設定を ''{0}''とするのに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "不正な設定がファイルの{0}行目にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3519,5 +3520,5 @@
 "ありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3528,5 +3529,5 @@
 "ではありません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3536,5 +3537,5 @@
 "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3545,5 +3546,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3553,5 +3554,5 @@
 "成します。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3561,5 +3562,5 @@
 "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3570,5 +3571,5 @@
 "トできません</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3579,5 +3580,5 @@
 "<br>に取って、新しい初期設定ファイルを作ります。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3588,10 +3589,10 @@
 "に失敗"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "エラー: ブックマークファイル''{1}'' に予期せぬ行 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3715,5 +3716,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3790,9 +3791,9 @@
 "は {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3802,5 +3803,5 @@
 "う一方は新規ではないためです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3992,15 +3993,34 @@
 msgstr "PUWG 2000 ゾーン {0} (ポーランド)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "スイスグリッド (スイス)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTMゾーン"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "北緯"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "南"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "そこへジャンプ"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4024,9 +4044,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4070,5 +4090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "鉄道"
@@ -4089,5 +4109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4341,69 +4361,69 @@
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "境界囲みをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "言語の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4416,9 +4436,9 @@
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4427,57 +4447,65 @@
 "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "プラグイン更新中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "更新されたプラグインをインストール中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "未保存のOSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "復元"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "デビットカード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4487,9 +4515,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "JOSMを終了"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4503,9 +4531,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4629,23 +4658,23 @@
 msgstr "ユーザ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "レイヤー ''{0}'' はレイヤーのリスト中になければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4741,5 +4770,5 @@
 msgstr "クリックしてダイアログを閉じ、オブジェクト削除を中断"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4749,17 +4778,17 @@
 "ださい。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "ズームレベル:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "min（最小値）"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "max (最大値)"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4772,25 +4801,25 @@
 "i>。<i>zoom,x,y</i> or <i>zoom;x;y</i>での指定も可能です。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "タイルのアドレス:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "タイルのアドレスを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "タイルアドレスを入力"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "現在の値は正しいタイルアドレスではない"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "タイルのインデックスを入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5200,4 +5229,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5280,4 +5310,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5294,4 +5325,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5365,5 +5397,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5375,10 +5407,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "なし"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "全て"
@@ -5459,5 +5491,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5468,5 +5500,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5500,17 +5532,17 @@
 msgstr "未決定です"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "ロール:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "全てのリレーションメンバーシップ用のロールを入力"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Tag modified relations with "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5520,16 +5552,16 @@
 "ます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "キー:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-"<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5537,5 +5569,5 @@
 msgstr "値:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5544,5 +5576,5 @@
 "strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5559,5 +5591,5 @@
 "中でもともとのウエイの場所で示されます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5569,5 +5601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "全てのメンバーにこのロールを適用"
@@ -5713,5 +5745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5824,5 +5856,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5830,5 +5862,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5836,5 +5868,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5842,5 +5874,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5848,5 +5880,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5855,5 +5887,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5861,5 +5893,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5867,5 +5899,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5873,24 +5905,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>有効なフィルタ</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 件の非表示オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 件の無効化オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<p></html>"
@@ -5911,5 +5943,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5934,37 +5966,37 @@
 msgstr "詳細なオブジェクト情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "新しいノードの座標を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "十進経緯度を使う。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "-90から90の範囲で正しい緯度を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "-90から90の範囲で緯度を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "-180から180の範囲で正しい経度を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "-180から180の範囲で経度を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "ダイアログを閉じて新しいノードを作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "ダイアログを閉じて、新しいノードを作成しない"
@@ -6020,9 +6052,9 @@
 msgstr "レイヤーについての情報"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "リレーション"
@@ -6070,10 +6102,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "選択されたリレーションの不完全なメンバーをダウンロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "不完全なメンバーをダウンロード"
@@ -6093,37 +6125,37 @@
 msgstr "セレクションリスト　ウインドウを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "オブジェクトを検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "選択した要素にズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "リレーション用エディタを呼び出す"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "選択されたリレーション用にリレーションエディタを呼び出す"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6132,27 +6164,27 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "オブジェクトに内部状態に関して詳細な情報を取得。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "検査"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6161,5 +6193,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -6441,13 +6473,13 @@
 msgstr "ズームするものがありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "この変更セットの中身はダウンロードしていません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "すぐにダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "変更セットの内容をダウンロードする"
@@ -6559,4 +6591,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6575,6 +6611,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6592,8 +6626,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6604,4 +6645,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6616,33 +6663,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6666,12 +6702,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6743,10 +6789,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6776,8 +6826,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6840,6 +6886,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6892,4 +6936,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6954,32 +7010,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6988,6 +7052,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6996,24 +7062,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7028,82 +7084,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7184,155 +7240,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "名前"
@@ -7780,4 +7841,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<差異あり>"
@@ -8301,17 +8363,17 @@
 msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "直接の親子関係を含む"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "親リレーションをロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "親リレーションをロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "選択しているリレーションを編集"
@@ -8596,4 +8658,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8601,15 +8664,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "タイプ"
@@ -8628,16 +8691,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "不明な"
@@ -9257,5 +9320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "ファイルを選ぶためにファイル選択を起動してください"
@@ -9485,20 +9548,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "レイヤー"
@@ -9976,5 +10039,60 @@
 msgstr[0] "削除するオブジェクトの個数: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "名前: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} トラック"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "説明"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "時間間隔"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "長さ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0}ルート, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} ウェイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9982,59 +10100,16 @@
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "名前: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "記述: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} トラック"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "説明"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "時間間隔"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "長さ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "長さ: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0}ルート, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} ウェイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10045,10 +10120,10 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10059,7 +10134,7 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10067,10 +10142,10 @@
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10078,10 +10153,10 @@
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10089,21 +10164,21 @@
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "近隣をダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "トラックのみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "ウェイポイントのみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "トラックおよびウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10115,9 +10190,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10127,5 +10202,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10135,30 +10210,30 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10166,5 +10241,5 @@
 msgstr "配色のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10173,5 +10248,5 @@
 msgstr "既定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10180,18 +10255,18 @@
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10203,23 +10278,23 @@
 "タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "インポートできません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10662,15 +10737,15 @@
 msgstr "画像ファイルが削除できません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "画像なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "{0} 読み込み中です"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11684,4 +11759,49 @@
 msgid "Voice recorder calibration"
 msgstr "ボイスレコーダの調整"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "更新周期(日数):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "既定値は \"{0}\"です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "ファイルバックアップ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "バックアップファイルを作成するかどうか構成を決める"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11765,5 +11885,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "自動車"
@@ -11782,16 +11902,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "自転車"
@@ -11825,12 +11945,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "徒歩"
@@ -12080,18 +12200,18 @@
 msgstr "既定（自動判定）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "ビルトインのデフォルトを有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "ビルトインアイコンのデフォルトを有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "使用スタイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "地図塗りつぶしスタイル"
@@ -12410,27 +12530,19 @@
 msgstr "投影法 {0} は、有効化できませんでした。メルカトル図法を使います。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "認証"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "プロキシ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "ファイルバックアップ"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "OSMサーバへの認証方式の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "プロクシサーバを使用するかどうか構成を決める"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "バックアップファイルを作成するかどうか構成を決める"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -12547,6 +12659,15 @@
 "翻訳):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "外部ツール"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12786,13 +12907,4 @@
 "用してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "バックアップファイルの保存"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12983,5 +13095,5 @@
 msgstr "新しいタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12992,49 +13104,49 @@
 "にあるものと同じでなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "この地物の詳細情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明な必要条件: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "利用可能なロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "ロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "件数"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "エレメント"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "親の無いロール要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "親の無いサブ要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13044,15 +13156,15 @@
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13061,17 +13173,17 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13705,5 +13817,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13808,5 +13920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13815,5 +13927,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13885,5 +13997,5 @@
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13895,10 +14007,10 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "<way> 要素を直接引き継いでない XML 要素の <nd> が見つかった。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13906,5 +14018,5 @@
 msgstr "ウェイ {1} の<nd>上に必要な属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13912,5 +14024,5 @@
 msgstr "要素 <nd> の属性 ''ref'' に不正な値。入力値: {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13918,5 +14030,5 @@
 msgstr "削除されたウェイ {0} にはノードがあります"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -13924,5 +14036,5 @@
 "要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13930,5 +14042,5 @@
 msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13936,5 +14048,5 @@
 msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13942,5 +14054,5 @@
 msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13950,10 +14062,10 @@
 "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "ref=0の不完全な<member>指定です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13961,9 +14073,9 @@
 msgstr "削除されたリレーション {0} にはメンバーがあります"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "タグ内のキーまたは値属性が見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13971,11 +14083,11 @@
 msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13987,8 +14099,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14004,5 +14116,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14010,5 +14122,5 @@
 msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14017,6 +14129,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14030,6 +14142,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14038,5 +14150,5 @@
 msgstr "属性 ''changeset'' に不正な値。入力値 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14044,5 +14156,5 @@
 msgstr "必要な属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14050,13 +14162,13 @@
 msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14064,5 +14176,5 @@
 msgstr "削除されたノード {0} はウェイ {1} の一部です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14072,5 +14184,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14082,5 +14194,5 @@
 "しています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14088,17 +14200,17 @@
 msgstr "削除されたメンバー {0} はリレーション {1} で使われています"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "OSMデータ解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "データセット準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14623,11 +14735,11 @@
 msgstr "プラグインリストをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "''{0}'' からプラグインリストをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14638,16 +14750,16 @@
 "からのプラグインリストをキャッシュできません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "ローカルキャッシュ ''{0}'' にプラグインリストを書き込み中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "サイト ''{0}'' からのプラグインリストをパースしています"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14658,5 +14770,5 @@
 "す。例外コード: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14677,13 +14789,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "何もしない"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "バグを報告する"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14694,9 +14806,9 @@
 "を実行している場合は、おおらかな気持ちでバグレポートをファイルしてください。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "予想外の例外"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14706,5 +14818,5 @@
 "ンに更新したかどうかこちらで確認してください:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14714,5 +14826,5 @@
 "使ってバグトラッカーにバグレポートをファイルしてください:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14723,5 +14835,5 @@
 "ための情報をできるだけ詳細に追加してみてください。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14730,9 +14842,9 @@
 "ちゃんと機能していない場合は、代わりに次のURLで手作業で情報を入力できます:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(テキストはクリップボードにコピーされています。)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "JOSMのバグです"
@@ -14968,5 +15080,5 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15027,5 +15139,5 @@
 msgstr "未使用"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15039,5 +15151,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15047,5 +15159,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15056,5 +15168,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(ヒント:設定でショートカットキーを選べます。)"
@@ -15166,5 +15278,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "表示"
@@ -15250,10 +15362,62 @@
 msgstr "openstreetmap.org へトレースをアップロード"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "営業時間"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "{0}このオブジェクトのプロパティーの変更"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "選択"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "ウェイ {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "ツール: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "フィルタ内にエラー"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "オープン"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -15427,55 +15591,55 @@
 msgstr "ウェイをアライン"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"接続されたセグメントはアラインできません。\n"
-"ノードを共有していない２つのセグメントを選択してください。"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"アラインするとノードを世界の外におくことになります。\n"
+"あなたの操作を元に戻しています。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "準備完了！"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "ウェイセグメントをアライン"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "パラメータの ''{0}'' はヌルではいけません"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"アラインするとノードを世界の外におくことになります。\n"
-"あなたの操作を元に戻しています。"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "準備完了！"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "ウェイセグメントをアライン"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "パラメータの ''{0}'' はヌルではいけません"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15574,16 +15738,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15597,5 +15753,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "次回は表示しない"
@@ -15708,5 +15864,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "建物"
@@ -15958,5 +16114,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16393,8 +16549,4 @@
 msgstr "東経"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "北緯"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16517,6 +16669,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "空のレイヤー"
@@ -17897,5 +18049,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "公共交通機関"
@@ -17939,48 +18091,53 @@
 msgstr "トラック"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "APIからデータ読み込み"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "{0} からデータをインポート"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "新しいオブジェクトを作成"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "選択の変更"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "表示領域を変更"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr "プロトコルバージョンを読み込む"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "全てのリモコン操作を手動で確認"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "JOSMをほかのアプリーケーションから制御できるようにするプラグインです。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "リモート制御"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "リモート制御プラグインの設定。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17991,21 +18148,21 @@
 "会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "リモート制御の指示を確認した"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18013,5 +18170,5 @@
 "た。:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
@@ -18019,10 +18176,10 @@
 "求されました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "リクエストの詳細: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18247,58 +18404,58 @@
 msgstr "エリアから不要なノードを削除。"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "自動ズーム"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "タイルの読み込み"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "タイル情報を表示"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "全てのタイルをロード"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "ズームアップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "ズームダウン"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "タイルのキャッシュをフラッシュ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "画像 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "自動ズーム"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "タイルの自動読み込み"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "スリッピマップ プラグイン用設定"
@@ -18582,11 +18739,10 @@
 msgstr "テラスハウス"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "SeaMapシンボルを編集"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr "Seamarkエディタ"
@@ -19107,4 +19263,6 @@
 "creating/editing a turn restriction from the current JOSM selection."
 msgstr ""
+"<strong>キーボードショートカット</strong>の構成を決めてください。これは現在の"
+"JOSM選択からの方向転換制限作成/編集のトリガーになります。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
@@ -19177,4 +19335,5 @@
 "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
 msgstr ""
+"基本エディタに移動し、手動で\"from\"と\"to\"のロールのメンバーを選択する"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
@@ -19683,5 +19842,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -19803,59 +19962,59 @@
 msgstr "重なったウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "リレーションチェッカー:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "このプラグインはリレーション内のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "リレーション種別が不明です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "リレーションは空です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "ロール{0} がありません"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "ロール検証に問題"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "ロール {0}は不明です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "空のロールが見つかりました"
@@ -20134,17 +20293,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
 msgid "The \"from\" way does not start or end at a \"via\" node"
-msgstr ""
+msgstr "\"from\"ウェイは\"via\"ノードで開始または終了していません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
 msgid "The \"to\" way does not start or end at a \"via\" node"
-msgstr ""
+msgstr "\"to\"ウェイは\"via\"ノードで開始または終了していません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:176
 msgid "The \"from\" way does not start or end at a \"via\" way."
-msgstr ""
+msgstr "\"from\"ウェイは\"via\"ウェイで開始または終了していません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:181
 msgid "The \"to\" way does not start or end at a \"via\" way."
-msgstr ""
+msgstr "\"to\"ウェイは\"via\"ウェイで開始または終了していません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
@@ -20249,5 +20408,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
 msgid "No tags"
-msgstr ""
+msgstr "タグ無し"
 
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
@@ -20257,30 +20416,30 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
 msgid "Unconnected nodes without physical tags"
-msgstr ""
+msgstr "物理的なタグの無い未接続ノード"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
 msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr ""
+msgstr "''fixme'' や ''FIXME''を含むタグがあります"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
-msgstr ""
+msgstr "''note'' や ''comment'' や ''description''のキーがあります"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
-msgstr ""
+msgstr "''created_by'' や ''converted_by''のキーがあります"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
-msgstr ""
+msgstr "''watch''のキーがあります"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
-msgstr ""
+msgstr "''source''のキーがあります"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62
@@ -20342,144 +20501,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "ビデオ中の現在位置を表示"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+msgstr "ビデオをインポート"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+msgstr "このGPSトラックに対してビデオを同期"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+msgstr "ビデオを削除"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+msgstr "現在のビデオをレイヤから削除"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+msgstr "再生/停止"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+msgstr "ビデオ再生を開始/停止"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+msgstr "戻る"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+msgstr "n 秒前にジャンプ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "上"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr "ジャンプ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+msgstr "入力されたGPS時刻にジャンプ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "タイルのインデックスを入力してください"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "GPSのタイムコードを入力してください"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "進む"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+msgstr "n 秒先にジャンプ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "踏み越し段"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "ビデオ中の現在位置を表示"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20499,7 +20654,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "複数個"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20603,12 +20757,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "検索から選択"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "ウェイポイント"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20625,9 +20777,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "例外が発生しました"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "キャッシュにありません"
@@ -20688,21 +20840,21 @@
 msgstr "WMSレイヤーの位置を調整"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "調整するWMSレイヤーを選択してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "WMSレイヤーを選択"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "調整開始"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "現在は調整するWMSレイヤーがありません。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "調整するレイヤーがありません"
@@ -20713,5 +20865,5 @@
 msgstr "{0}からWMSタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20722,5 +20874,5 @@
 "ん。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20728,10 +20880,10 @@
 msgstr "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "警告: 完全なURL は ''{0}' です。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20742,24 +20894,24 @@
 "間違った座標にたどりつく可能性があります。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(無効化)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20773,17 +20925,17 @@
 "設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "はい、画像を取得します"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "不正なURL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20791,58 +20943,83 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "WMSブックマークをセット"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "マップオブジェクトが見つかりません。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "ファイルからデータをロードするためのブランクWMSレイヤーを開く"
@@ -20911,10 +21088,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"リモートコントロールは以下のURLからデータをインポートするように確認されまし"
-"た。:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21429,11 +21603,16 @@
 "す。（一般的な Java - タブレット問題）"
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21442,5 +21621,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21448,5 +21627,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21456,5 +21635,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21465,5 +21644,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21474,10 +21653,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21485,15 +21664,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "変更セットを元に戻すプラグイン"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21503,5 +21682,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21513,10 +21692,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21525,5 +21704,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21534,15 +21713,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21555,15 +21734,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21572,5 +21751,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21579,5 +21758,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21586,10 +21765,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21600,5 +21779,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21608,5 +21787,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21617,20 +21796,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21639,5 +21818,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21679,4 +21858,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21709,10 +21889,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "道路"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "ストリート"
@@ -21723,5 +21903,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "自動車専用道路"
@@ -21730,5 +21910,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "自動車専用道路の編集"
@@ -21765,10 +21945,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "道路番号"
@@ -21782,8 +21962,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "車線数"
@@ -21802,13 +21982,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -21842,17 +22022,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "一方通行"
@@ -21889,17 +22069,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21933,17 +22113,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "トンネル"
@@ -21974,17 +22154,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "切り通し"
@@ -22015,17 +22195,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "土手"
@@ -22033,5 +22213,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "自動車専用道路の連絡路"
@@ -22040,5 +22220,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "自動車専用道路の連絡路の編集"
@@ -22046,5 +22226,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "国道"
@@ -22053,5 +22233,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "国道の編集"
@@ -22061,6 +22241,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "車道"
@@ -22068,5 +22248,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "国道の連絡路"
@@ -22075,5 +22255,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
@@ -22086,5 +22266,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "主要地方道"
@@ -22093,5 +22273,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "主要地方道を編集"
@@ -22099,10 +22279,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "主要地方道の連絡路"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "主要地方道の連絡路の編集"
@@ -22114,5 +22294,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "一般地方道"
@@ -22122,5 +22302,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "一般地方道の編集"
@@ -22128,5 +22308,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "一般道(2車線以上)"
@@ -22136,5 +22316,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "一般道(2車線以上)の編集"
@@ -22146,5 +22326,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "一般道(2車線未満)"
@@ -22154,5 +22334,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "一般道(2車線未満)の編集"
@@ -22162,6 +22342,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "対向車待機所"
@@ -22184,15 +22364,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -22204,5 +22384,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住区域内道路"
@@ -22211,5 +22391,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "居住区域内道路の編集"
@@ -22229,12 +22409,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "表面"
@@ -22256,166 +22436,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "未舗装"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "アスファルト"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "コンクリート"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "金属"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "森"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "敷石"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "敷石"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "砂利道"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "小石"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "圧縮"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "砂地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "地表"
@@ -22423,5 +22603,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "私道"
@@ -22430,5 +22610,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -22436,5 +22616,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "歩行者専用道路"
@@ -22443,5 +22623,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "歩行者専用道路の編集"
@@ -22449,5 +22629,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "敷地内道路"
@@ -22456,5 +22636,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "敷地内道路の編集"
@@ -22464,18 +22644,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "敷地内道路のタイプ"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -22483,5 +22663,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -22491,10 +22671,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -22503,5 +22683,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -22509,14 +22689,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "工事中"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "ジャンクション"
@@ -22532,5 +22712,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -22539,5 +22719,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "通行制限"
@@ -22546,15 +22726,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "料金"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -22562,5 +22742,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "アクセス"
@@ -22586,4 +22766,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22591,4 +22772,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22664,236 +22851,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "私道"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "関係車両のみ可"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "農業の"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "いいえ"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "はい"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "指定済み"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "私道"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "行き先"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "関係車両のみ可"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "農業の"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "いいえ"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "指定済み"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -22908,10 +23102,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "馬"
@@ -22927,10 +23121,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -22945,19 +23140,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -22965,20 +23160,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
@@ -22986,5 +23181,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -22995,5 +23190,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -23013,10 +23208,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "自動車専用道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "自動車専用道路の連結路"
@@ -23038,10 +23233,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -23063,10 +23258,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "主要地方道"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "主要地方道の連絡路"
@@ -23088,5 +23283,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23101,9 +23296,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "一般道(2車線以上)"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "一般道(2車線未満)"
@@ -23117,9 +23312,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "居住区域内道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "私道"
@@ -23163,10 +23358,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -23196,5 +23391,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23206,10 +23401,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -23217,10 +23412,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "ウェイ"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "トラック"
@@ -23229,35 +23424,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "トラックの編集"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "トラック種別"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -23265,5 +23460,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "小道"
@@ -23272,76 +23467,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "小道の編集"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "中間"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "車いす"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "スキー"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "スノーモービル"
@@ -23350,5 +23545,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "馬車専用道"
@@ -23356,5 +23551,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -23362,5 +23557,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "自転車専用道"
@@ -23378,11 +23573,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "歩行者専用道路"
@@ -23390,5 +23585,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "分割された歩行者および自転車道"
@@ -23396,5 +23591,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "統合された歩行者および自転車道"
@@ -23402,5 +23597,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "遊歩道"
@@ -23409,5 +23604,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "遊歩道の編集"
@@ -23415,5 +23610,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "階段"
@@ -23423,10 +23618,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "席の数"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
@@ -23434,15 +23635,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "敷地内道路"
@@ -23450,5 +23651,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -23456,10 +23657,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23488,36 +23690,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "操作員"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "復元"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "レストランの編集"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "緊急電話"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -23527,5 +23750,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -23534,27 +23757,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -23562,6 +23785,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -23570,11 +23793,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -23582,30 +23805,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "停止"
@@ -23613,67 +23836,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "横断歩道"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "踏切の編集"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "タイプ名(UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "交通静穏化"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "交通静穏化を編集"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "対向車待機所"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "対向車待機所を編集"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -23684,14 +23845,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "横断歩道"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "踏切の編集"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "タイプ名(UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "交通静穏化"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "交通静穏化を編集"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "対向車待機所"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "対向車待機所を編集"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "転回場"
@@ -23701,5 +23924,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "市境界標識"
@@ -23707,15 +23930,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -23724,11 +23947,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "緊急電話"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "坂"
@@ -23736,5 +23954,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -23742,5 +23960,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "凍結防止用のグリット入れ"
@@ -23750,10 +23968,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -23761,5 +23979,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -23767,5 +23985,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -23774,10 +23992,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "高度"
@@ -23785,5 +24003,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "ゲート等"
@@ -23791,5 +24009,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "車止め杭"
@@ -23797,5 +24015,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -23840,16 +24058,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -23858,5 +24076,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "ブロック"
@@ -23865,5 +24083,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -23871,5 +24089,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -23877,5 +24095,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -23883,15 +24101,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "料金所"
@@ -23899,5 +24117,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -23905,10 +24123,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -23917,5 +24135,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "生け垣"
@@ -23926,22 +24144,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "フェンス"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "壁"
@@ -23949,5 +24167,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "城壁"
@@ -23956,5 +24174,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -23965,10 +24183,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "入り口の編集"
@@ -23976,5 +24194,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "ゲート"
@@ -23982,50 +24200,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "ワイヤゲート"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "ワイヤゲートの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "踏み越し段"
@@ -24033,25 +24251,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "回転式木戸"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -24059,25 +24277,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "泉"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "泉の編集"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "側溝"
@@ -24085,10 +24292,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -24096,10 +24303,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "小川"
@@ -24107,10 +24314,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "運河"
@@ -24118,10 +24325,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "川"
@@ -24131,60 +24338,114 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "河川の編集"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "泉"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "泉の編集"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "滝"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "滝の編集"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "堰"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "ダムの編集"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "ダム"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "ダムの編集"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "水たまり、窪地"
+
+# 水たまりになるような土地
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "窪地、水盤場の盆地"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "ため池"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "ため池の編集"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "蓋付きため池"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "蓋のされたため池の編集"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "陸地の編集"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "水たまり、窪地"
-
-# 水たまりになるような土地
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "窪地、水盤場の盆地"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "ため池"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "ため池の編集"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "蓋付きため池"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "蓋のされたため池の編集"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "海岸線"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "海岸線の編集"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "川岸"
@@ -24193,10 +24454,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "湿地帯"
@@ -24207,14 +24469,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "湿地"
@@ -24228,35 +24490,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "泥地"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "砂浜"
@@ -24264,20 +24526,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "湾"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "崖"
@@ -24285,145 +24547,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "海岸線"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "海岸線の編集"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "買い物"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "フェリーターミナル"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "フェリーターミナルの編集"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "自動車"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "初心者"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "自転車"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "フェリー航路"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "ボートヤード(陸上の船置き場)"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "ボートヤードの編集"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "ドック"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "ドックの編集"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "ダム"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "ダムの編集"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "水路ポイント"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "マリーナ"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "マリーナの編集"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "桟橋"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "桟橋の編集"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "ロックゲート"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "堰"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "ダムの編集"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "滝"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "滝の編集"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "転回地点"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "マリーナ"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "マリーナの編集"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "桟橋"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "桟橋の編集"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "フェリーターミナル"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "フェリーターミナルの編集"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24433,16 +24766,38 @@
 msgstr "スリップウェイの編集"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "ボートヤード(陸上の船置き場)"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "ボートヤードの編集"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "ドック"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "ドックの編集"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "輸送"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "線路"
@@ -24450,5 +24805,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -24478,7 +24833,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24494,8 +24849,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24509,29 +24864,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24544,8 +24899,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24616,8 +24971,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24629,8 +24984,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "電圧"
@@ -24643,8 +24998,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "周波数 (Hz)"
@@ -24657,23 +25012,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "モノレール"
@@ -24681,50 +25036,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -24732,5 +25087,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -24739,10 +25094,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
@@ -24751,9 +25106,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "追加のタイプ"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -24762,5 +25117,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "踏切"
@@ -24769,5 +25124,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -24777,5 +25132,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -24783,5 +25138,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -24790,5 +25145,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24797,10 +25152,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -24808,10 +25163,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -24819,10 +25174,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -24830,10 +25185,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "ゴンドラ"
@@ -24841,10 +25196,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24853,5 +25209,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24859,5 +25215,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24866,5 +25222,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24872,5 +25228,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -24880,69 +25236,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "陸地"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "エッソ"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "増加"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24959,34 +25338,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24994,37 +25374,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "営業時間"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25045,33 +25436,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25080,170 +25473,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "店"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "コンビニエンスストア"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "キオスク"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "燃料の種類:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "ディーゼル"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "バイオ燃料(ディーゼル)"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10%エタノール混合)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85(85%エタノール混合)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPGガス"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "天然ガス"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -25251,4 +25666,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25260,6 +25676,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "駐車場"
@@ -25268,5 +25684,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -25277,25 +25693,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "表面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -25304,54 +25722,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "カーディーラ"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "自動車パーツショップの編集"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "はい"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "樹木・林の編集"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "内容"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "電話番号"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Fax番号"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Webサイト"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Eメールアドレス"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "レンタル"
@@ -25360,10 +25922,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -25371,28 +25932,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "駐輪場の編集"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "収容台数"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "自動二輪"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "自動車専用道路の編集"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "敷地内道路"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "サイズ調整"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "陸地"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "プリセット"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "被服"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "収容台数"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "自転車屋"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25402,5 +26022,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25408,5 +26028,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -25414,5 +26034,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "停車場"
@@ -25420,5 +26040,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -25426,5 +26046,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -25433,5 +26053,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -25439,5 +26059,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -25446,5 +26066,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -25456,5 +26076,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -25462,10 +26082,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -25474,10 +26094,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "車いす"
@@ -25486,5 +26106,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -25493,5 +26113,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -25499,5 +26119,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "バス停"
@@ -25507,13 +26127,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "避難所"
@@ -25521,19 +26140,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "ベンチ"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "点字ブロック"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -25541,5 +26160,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "タクシー"
@@ -25547,5 +26166,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -25553,10 +26172,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "空港"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25564,5 +26183,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25570,10 +26189,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25582,5 +26201,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "滑走路"
@@ -25588,5 +26207,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "滑走路の編集"
@@ -25594,5 +26213,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "誘導路"
@@ -25600,5 +26219,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "誘導路の編集"
@@ -25606,5 +26225,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25612,5 +26231,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25620,5 +26239,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "エプロン"
@@ -25628,5 +26247,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "格納庫"
@@ -25637,6 +26256,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "ビーコン"
@@ -25646,5 +26265,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "吹き流し"
@@ -25653,5 +26272,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "ターミナル"
@@ -25659,5 +26278,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "ターミナルの編集"
@@ -25665,15 +26284,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "ターミナルゲートの編集"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "旅行"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -25685,5 +26304,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -25692,5 +26311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
@@ -25703,8 +26322,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "星の数"
@@ -25728,34 +26347,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr "インターネットアクセス"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25769,168 +26388,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "駅"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr "インターネットアクセス費用"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr "喫煙"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "電話番号"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr "Fax番号"
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr "Webサイト"
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr "Eメールアドレス"
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "モーテル"
@@ -25938,20 +26462,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -25959,10 +26483,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "ホステル"
@@ -25970,30 +26494,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -26001,10 +26526,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -26015,5 +26540,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -26021,5 +26546,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -26027,5 +26552,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -26033,79 +26560,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "サンドイッチ"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "寿司"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -26113,18 +26640,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "チキン"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26132,10 +26659,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "カフェ"
@@ -26143,10 +26670,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -26154,20 +26686,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "パブの編集"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "バー"
@@ -26175,10 +26707,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "バーの編集"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -26186,25 +26718,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "博物館"
@@ -26212,9 +26744,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "動物園"
@@ -26223,9 +26755,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "テーマパーク"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "テーマパークの編集"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "美術館"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "美術館の編集"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -26233,50 +26786,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "テーマパーク"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "テーマパークの編集"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "美術館"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "美術館の編集"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "シェルターの編集"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "野外炉"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "ピクニック場(野外調理場)"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "ピクニック場の編集"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "地形"
@@ -26314,5 +26868,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26320,28 +26874,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -26351,5 +26905,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -26357,5 +26911,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "ハイキング"
@@ -26363,6 +26917,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "サイクリング"
@@ -26370,5 +26924,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -26376,6 +26930,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "スキー"
@@ -26383,5 +26937,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "乗馬"
@@ -26389,46 +26943,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26437,5 +26991,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -26443,55 +26997,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "シェルターの編集"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "野外炉"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "ピクニック場(野外調理場)"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "ピクニック場の編集"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "城"
@@ -26500,19 +27033,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -26521,9 +27054,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -26531,10 +27064,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "化石サイト"
@@ -26542,5 +27075,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
@@ -26548,15 +27081,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -26564,55 +27097,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "遊び場"
@@ -26620,35 +27153,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -26662,6 +27195,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -27077,6 +27610,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27111,240 +27644,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "アメリカンフットボール"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "カナディアンフットボール"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "ゲーリックフットボール"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "ラグビーリーグ"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "(通常の)ラグビー"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -27361,5 +27894,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27386,23 +27918,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "タイプ"
@@ -27419,5 +27959,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27444,211 +27983,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "モータースポーツ"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "モータースポーツの編集"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -27656,52 +28198,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "射撃"
@@ -27709,163 +28251,163 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "アメリカンフットボール"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "アメリカンフットボールを編集"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "カナディアンフットボール"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "カナディアンフットボールを編集"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "ゲーリックフットボール"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "ゲーリックフットボールを編集"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "ラグビーリーグ"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr "ラグビーリーグの編集"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "ラグビー(通常の)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "ラグビー(通常の)の編集"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "ペロタ"
@@ -27873,41 +28415,107 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "モータースポーツ"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "モータースポーツの編集"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "警告"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "駐車場の編集"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "自動車"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "モータースポーツの編集"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "スケート場の編集"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "国境検査所の編集"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "自動車"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "ケーブルカーの編集"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "建物"
@@ -27915,5 +28523,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "公共の建物"
@@ -27921,10 +28529,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "役場"
@@ -27932,10 +28540,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "大使館"
@@ -27943,10 +28551,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "裁判所"
@@ -27955,10 +28563,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "刑務所"
@@ -27967,10 +28575,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "警察"
@@ -27980,10 +28588,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "消防署"
@@ -27992,10 +28600,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "郵便局"
@@ -28003,5 +28611,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -28009,15 +28617,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "学校"
@@ -28025,10 +28633,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "大学"
@@ -28036,10 +28644,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "短大"
@@ -28047,5 +28655,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "短大の編集"
@@ -28053,5 +28661,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "映画館"
@@ -28060,10 +28668,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "図書館"
@@ -28072,9 +28680,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "美術館"
@@ -28082,10 +28690,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "劇場"
@@ -28094,10 +28702,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -28107,5 +28715,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -28114,6 +28722,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "宗教"
@@ -28122,66 +28730,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "宗派"
@@ -28190,189 +28798,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "スンニ派"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "住所"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "住所情報の編集"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "番地"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "家の名前"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "ストリートの名前"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "都市名"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "郵便番号"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "国コード"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "住所の補間を編集"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "番地付けルール"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "奇数"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "偶数"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "アルファベット順"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -28380,25 +28918,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "灯台"
@@ -28406,10 +28944,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "風車"
@@ -28417,10 +28955,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -28429,41 +28967,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -28473,10 +29011,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "クレーン"
@@ -28484,5 +29022,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "クレーンの編集"
@@ -28490,10 +29028,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -28501,10 +29039,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -28512,23 +29050,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "発電機"
@@ -28538,35 +29076,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "変電所"
@@ -28575,10 +29113,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -28587,5 +29125,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -28593,10 +29131,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "送電塔"
@@ -28607,23 +29145,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "送電線"
@@ -28632,20 +29170,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28653,55 +29191,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "制限"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "電話"
@@ -28710,5 +29248,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -28716,5 +29254,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "コイン"
@@ -28722,5 +29260,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "備考"
@@ -28728,5 +29266,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -28734,5 +29272,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -28740,15 +29278,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "リサイクル"
@@ -28757,5 +29295,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -28763,35 +29301,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "カン"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "被服"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -28799,5 +29332,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
@@ -28806,31 +29339,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "茶"
@@ -28909,5 +29442,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28917,31 +29450,31 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -28949,31 +29482,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "噴水"
@@ -28982,10 +29515,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -28994,10 +29527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -29006,5 +29539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
@@ -29012,501 +29545,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "徒歩"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "スーパーマーケット"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "スーパーマーケットの編集"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "コンビニエンスストア"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "コンビニの編集"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "キオスク"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "キオスクの編集"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "精肉店"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "精肉店の編集"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "パン屋"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "パン屋の編集"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "オーガニック"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "オーガニック（有機）ショップの編集"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "酒屋"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "酒屋の編集"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "飲料店"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "酒屋(飲み物屋)の編集"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "店舗"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "薬品屋"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "薬品屋の編集"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "美容院"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "美容院の編集"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "メガネ屋"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "眼鏡屋の編集"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "コンピュータ店の編集"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "靴店"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "靴店の編集"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "アウトドア店"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "アウトドア店の編集"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "スポーツ店"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "クリーニング店"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "クリーニング店の編集"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "ランドリー"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "ランドリーの編集"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "高架鉄道"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "線路の編集"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "コンピュータ店"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "コンピュータ店の編集"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "家電店"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "家電店の編集"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "オーディオショップ"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "オーディオショップの編集"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "ビデオ"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "ビデオショップの編集"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "生花店"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "生花店の編集"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "園芸用品店"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "園芸用品店の編集"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "金物屋"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "金物屋の編集"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "DIYショップ"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "DIYショップの編集"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "家具店"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "家具店の編集"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "文具店"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "文具店の編集"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "本屋"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "本屋を編集"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "旅行代理店"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "旅行代理店の編集"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "おもちゃ屋"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "おもちゃ屋の編集"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "自動販売機"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "自動販売機の編集"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "自動販売機"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "公共_交通_チケット"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "公共輸送計画"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "パーキングチケット"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "食料"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "飲料"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "甘味"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "たばこ"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "写真"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "ペットフード"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "新聞"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "おもちゃ"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "切手"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "携帯の契約"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "プリペイド携帯のチャージ"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "車"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "コンドーム"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "タンポン"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "糞袋"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "決済または会員用カード"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "お金"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "銀行"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "銀行の編集"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "ATM"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "両替"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "両替の編集"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "ATMの編集"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "健康"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "医院"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "医院の編集"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "歯科医院"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "歯科医院の編集"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "薬局"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "薬局の編集"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "調剤薬局"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "病院"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "病院の編集"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "店舗"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "カーディーラ"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "自動車パーツショップの編集"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "自転車屋"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "自転車ショップの編集"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "スーパーマーケット"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "スーパーマーケットの編集"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "薬品屋"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "薬品屋の編集"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "コンビニエンスストア"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "コンビニの編集"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "キオスク"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "キオスクの編集"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "本屋"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "本屋を編集"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "旅行代理店"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "旅行代理店の編集"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "精肉店"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "精肉店の編集"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "パン屋"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "パン屋の編集"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "生花店"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "生花店の編集"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "オーガニック"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "オーガニック（有機）ショップの編集"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "酒屋"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "酒屋の編集"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "飲料店"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "酒屋(飲み物屋)の編集"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "コンピュータ店"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "コンピュータ店の編集"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "家電店"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "家電店の編集"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "オーディオショップ"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "オーディオショップの編集"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "家具店"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "家具店の編集"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "園芸用品店"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "園芸用品店の編集"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "金物屋"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "金物屋の編集"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "DIYショップ"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "DIYショップの編集"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "文具店"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "文具店の編集"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "美容院"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "美容院の編集"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "靴店"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "靴店の編集"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "おもちゃ屋"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "おもちゃ屋の編集"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "ビデオ"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "ビデオショップの編集"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "クリーニング店"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "クリーニング店の編集"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "ランドリー"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "ランドリーの編集"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "アウトドア店"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "アウトドア店の編集"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "スポーツ店"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "メガネ屋"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "眼鏡屋の編集"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "自動販売機"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "自動販売機の編集"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "自動販売機"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "公共_交通_チケット"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "公共輸送計画"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "パーキングチケット"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "食料"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "飲料"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "甘味"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "たばこ"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "写真"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "ペットフード"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "新聞"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "おもちゃ"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "切手"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "携帯の契約"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "プリペイド携帯のチャージ"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "車"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "コンドーム"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "タンポン"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "糞袋"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "決済または会員用カード"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "お金"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "銀行"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "銀行の編集"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "ATM"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "両替"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "両替の編集"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "ATMの編集"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "健康"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "医院"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "医院の編集"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "歯科医院"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "歯科医院の編集"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "薬局"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "薬局の編集"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "調剤薬局"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "病院"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "病院の編集"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -29515,5 +30050,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -29522,15 +30057,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -29538,5 +30073,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "動物病院"
@@ -29545,368 +30080,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "境界線"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "国境"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "国境の編集"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "行政区画"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "行政区画の編集"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil境界"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Civil境界の編集"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "地点名"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Political境界の編集"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "国立公園"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "国立公園の境界編集"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "地名"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "大陸"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "国(country)"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "州(state)"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "州(state)の編集"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "地方"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "地方の編集"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "郡"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "郡の編集"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "市区"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "市区の編集"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "町"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "町の編集"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "近郊住宅地"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "村"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "村の編集"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "小村落"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "地域"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "地域の編集"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "山頂"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "山頂の編集"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "氷河"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "氷河の編集"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "火山"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "火山の編集"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "洞窟の入口"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "洞窟の入口の編集"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "島"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "島の編集"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "小島"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "小島を編集"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "自然"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "樹木・林"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "樹木・林の編集"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "植物の名前"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "森"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "森の編集"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "針葉樹"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "広葉樹"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "混合林"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "森林"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "森の編集"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "自然保護区"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "自然保護区の編集"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "洞窟の入口"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "洞窟の入口の編集"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "山頂"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "山頂の編集"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "氷河"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "氷河の編集"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "火山"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "火山の編集"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "境界線"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "国境"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "国境の編集"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "行政区画"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "行政区画の編集"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil境界"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Civil境界の編集"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "地点名"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Political境界の編集"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "国立公園"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "国立公園の境界編集"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "ガレ場"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "ガレ場の編集"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "山(Fell)"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "山(Fell)の編集"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "低木林"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "低木林の編集"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "荒れ地"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "荒れ地の編集"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "樹木・林"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "樹木・林の編集"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "植物の名前"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "森"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "森の編集"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "針葉樹"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "広葉樹"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "混合林"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "森林"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "森の編集"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "自然保護区"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "自然保護区の編集"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "ガレ場"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "ガレ場の編集"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "低木林"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "低木林の編集"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "山(Fell)"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "山(Fell)の編集"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "荒れ地"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "荒れ地の編集"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -29915,45 +30456,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -29961,25 +30502,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "里山"
@@ -29987,10 +30528,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "共有地"
@@ -29998,20 +30539,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -30019,5 +30560,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -30025,15 +30566,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "墓所"
@@ -30041,9 +30582,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -30051,39 +30592,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -30091,15 +30632,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -30107,52 +30648,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "駅"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "住所"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "住所情報の編集"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "番地"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "家の名前"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "ストリートの名前"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "都市名"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "郵便番号"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "国コード"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "東"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "南"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "住所の補間を編集"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "番地付けルール"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "奇数"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "偶数"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "アルファベット順"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "内容"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "作者情報の追加"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "画像"
 
 #. item "Relations/Multipolygon"
@@ -30160,5 +30834,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -30170,5 +30844,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "外側のセグメント"
@@ -30176,5 +30850,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -30182,5 +30856,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -30191,5 +30865,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -30197,36 +30871,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -30234,5 +30908,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -30241,5 +30915,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -30247,34 +30921,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -30283,15 +30957,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "ウェイへ"
@@ -30299,5 +30973,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "ルート"
@@ -30306,5 +30980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -30312,132 +30986,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "ルート種類"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "自転車"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "スキー"
@@ -30505,5 +31068,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30513,9 +31076,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "迂回路"
@@ -30529,10 +31092,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -30540,31 +31103,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -30573,30 +31136,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -34574,7 +35137,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "ランドサット"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34696,8 +35258,21 @@
 msgstr "Sicily - Italy"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "バックアップファイルの保存"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "接続されたセグメントはアラインできません。\n"
+#~ "ノードを共有していない２つのセグメントを選択してください。"
+
+#~ msgid "Waterway Point"
+#~ msgstr "水路ポイント"
 
 #~ msgid "Move"
@@ -34914,7 +35489,4 @@
 #~ msgid "Sync clock"
 #~ msgstr "時計の同期"
-
-#~ msgid "Image"
-#~ msgstr "画像"
 
 #~ msgid "Synchronize Time with GPS Unit"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 22859)
+++ applications/editors/josm/i18n/po/nb.po	(revision 22863)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-13 23:53+0000\n"
-"Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-24 12:26+0000\n"
+"Last-Translator: Anders Einar Hilden <post@anderseinar.net>\n"
 "Language-Team: Norwegian Bokmal <nb@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-08-20 19:12+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Advarsel"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap kartredigering"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -248,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -263,5 +263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -273,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -296,5 +296,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -405,4 +405,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1040,5 +1041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1047,5 +1048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1438,13 +1439,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1453,5 +1454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1459,9 +1460,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1469,5 +1470,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1501,8 +1502,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1511,9 +1512,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1529,6 +1530,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1538,5 +1539,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1561,6 +1562,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Feil"
@@ -1720,5 +1721,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Nei, avbryt"
@@ -1996,5 +1997,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2461,5 +2462,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2503,9 +2504,9 @@
 "Vil du virkelig flytte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slipp museknappen for å velge objektene i rektangelet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2514,9 +2515,9 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2783,5 +2784,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Søk"
@@ -2975,7 +2976,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3242,5 +3243,5 @@
 msgstr[1] "Flytt {0} noder"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3398,31 +3399,31 @@
 msgstr "Korriger egenskap automatisk"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3441,15 +3442,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Innstillingsfil har feil i linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3458,5 +3459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3465,5 +3466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3472,5 +3473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3479,5 +3480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3485,5 +3486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3492,5 +3493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3499,5 +3500,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3506,5 +3507,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3513,10 +3514,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3636,5 +3637,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3706,9 +3707,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3716,5 +3717,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3904,14 +3905,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveits)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "sør"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Gå dit"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3936,9 +3956,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3981,5 +4001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "jernbane"
@@ -4000,5 +4020,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4253,69 +4273,69 @@
 msgstr "Passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "bruk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Vis hjelp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix-geometri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Last ned områdeavgrensing"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Last ned områdeavgrensing som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Velg med gitt søkestreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Start maksimert"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Gå tilbake til standardinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4325,9 +4345,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4335,57 +4355,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Klargjør"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Laster første programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Setter standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Bygger opp hovedskjermbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Laster inn programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Bankkort"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4395,9 +4424,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4411,9 +4440,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4535,23 +4565,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4643,5 +4673,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4649,17 +4679,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4669,25 +4699,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5110,4 +5140,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5190,4 +5221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5204,4 +5236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5275,5 +5308,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5285,10 +5318,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "alle"
@@ -5370,5 +5403,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5380,5 +5413,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5413,17 +5446,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5431,15 +5464,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5447,10 +5480,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5462,5 +5495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5472,5 +5505,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5613,5 +5646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5724,5 +5757,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5730,5 +5763,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5736,5 +5769,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5742,5 +5775,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5748,5 +5781,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5755,5 +5788,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5761,5 +5794,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5767,5 +5800,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5773,24 +5806,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5811,5 +5844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5834,37 +5867,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Angi koordinatene for den nye noden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Bruk desimalgrader."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Venligst velg en gyldig breddegrad i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Venligst velg en breddegrad i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Venligst velg en gyldig lengdegrad i området -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Venligst velg en lengdegrad i området -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Lukk dialogen og opprett et nytt punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Lukk dialogen og ikke opprett et nytt punkt."
@@ -5920,9 +5953,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relasjoner"
@@ -5970,10 +6003,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5993,37 +6026,37 @@
 msgstr "Åpne vindu med en utvalgsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoom til utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zoom til valgt(e) element"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6032,32 +6065,32 @@
 msgstr "Utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -6334,13 +6367,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6452,4 +6485,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6468,6 +6505,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6485,8 +6520,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6497,4 +6539,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6509,33 +6557,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6559,12 +6596,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6636,10 +6683,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6669,8 +6720,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6733,6 +6780,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6785,4 +6830,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6847,32 +6904,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6881,6 +6946,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6889,24 +6956,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6921,82 +6978,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7077,155 +7134,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Navn"
@@ -7649,4 +7711,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<different>"
@@ -8151,17 +8214,17 @@
 msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8439,4 +8502,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8444,15 +8508,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Type"
@@ -8471,16 +8535,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "ukjent"
@@ -9060,5 +9124,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9281,20 +9345,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Lag"
@@ -9741,5 +9805,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Lengde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9747,62 +9869,17 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Lengde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} rute, "
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9812,10 +9889,10 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9826,7 +9903,7 @@
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9834,10 +9911,10 @@
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9845,10 +9922,10 @@
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9856,21 +9933,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9882,9 +9959,9 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9894,5 +9971,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9902,30 +9979,30 @@
 "utelatt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Bruk globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter i dette laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkt i dette laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Velg linjetegnings-innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9933,5 +10010,5 @@
 msgstr "Tilpass farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9940,5 +10017,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9947,18 +10024,18 @@
 msgstr "Velg en farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Markører fra navngitte punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne sporpunkt fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importer lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9968,23 +10045,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importer bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10427,15 +10504,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Ingen bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Laster {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -10998,5 +11075,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
 msgid "Allow to upload map data"
-msgstr ""
+msgstr "Tillat opplastning av kartdata"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
@@ -11006,5 +11083,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
 msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "Tillat opplastning av GPS-spor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
@@ -11014,5 +11091,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
 msgid "Allow to download your private GPS traces"
-msgstr ""
+msgstr "Tillat nedlastning av dine private GPS-spor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
@@ -11024,5 +11101,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
 msgid "Allow to read your preferences"
-msgstr ""
+msgstr "Tillat lesing av dine innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
@@ -11032,5 +11109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Tillat endring av dine innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
@@ -11050,5 +11127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "Forespørsel feilet"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
@@ -11387,4 +11464,48 @@
 msgid "Voice recorder calibration"
 msgstr "Stemme  recorder kalibrering"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Tid på innledning (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Standardverdien er «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11468,5 +11589,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Bil"
@@ -11485,16 +11606,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -11528,12 +11649,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Til fots"
@@ -11586,5 +11707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr ""
+msgstr "Automatisk"
 
 #. gpx data field name
@@ -11592,5 +11713,5 @@
 msgctxt "gpx_field"
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #. gpx data field name
@@ -11598,9 +11719,9 @@
 msgctxt "gpx_field"
 msgid "Desc(ription)"
-msgstr ""
+msgstr "Beskrivelse"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr ""
+msgstr "Begge"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
@@ -11787,18 +11908,18 @@
 msgstr "Standard (automatisk valgt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Benytt innebygd standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Brukt stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Map Pain stiler"
@@ -12115,26 +12236,18 @@
 msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12250,6 +12363,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternativ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12466,12 +12588,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Behold sikkerhetskopier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet."
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12651,5 +12765,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12658,49 +12772,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12710,15 +12824,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12728,17 +12842,17 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13348,5 +13462,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13452,5 +13566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13459,5 +13573,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13526,5 +13640,5 @@
 msgstr "Fila «{0}» finnes ikke"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13534,10 +13648,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13545,5 +13659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13551,5 +13665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13557,10 +13671,10 @@
 msgstr "Slettet linje {0} inneholder noder"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13568,5 +13682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13574,5 +13688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13580,5 +13694,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13587,10 +13701,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufullstendig <member>-spesifikasjon med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13598,9 +13712,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13608,11 +13722,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Ulovlig objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13624,8 +13738,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13639,5 +13753,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13645,5 +13759,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13652,6 +13766,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13663,6 +13777,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13671,5 +13785,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13677,5 +13791,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13683,13 +13797,13 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13697,5 +13811,5 @@
 msgstr "Slettet node {0} er del av linje {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13705,5 +13819,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13713,5 +13827,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13719,17 +13833,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14229,11 +14343,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14242,16 +14356,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14260,5 +14374,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14279,13 +14393,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Rapporter feil"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14294,9 +14408,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "En uventet unntakstilstand"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14304,5 +14418,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14310,5 +14424,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14317,5 +14431,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14323,9 +14437,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14521,5 +14635,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14572,5 +14686,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14583,5 +14697,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14591,5 +14705,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14600,5 +14714,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hint: Du kan endre hurtigtastene i Innstillinger.)"
@@ -14701,5 +14815,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14785,10 +14899,61 @@
 msgstr "Last opp spor til openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Åpningstider"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Endre egenskap på inntil {0} objekt"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Velg"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Linje {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Verktøy: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Fart"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -14960,51 +15125,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Kan ikke legge til node utenfor kartet."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' kan ikke vœre null"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' kan ikke vœre null"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15103,16 +15270,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15126,5 +15285,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15237,5 +15396,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Bygninger"
@@ -15476,5 +15635,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15902,8 +16061,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16021,6 +16176,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Blankt lag"
@@ -17398,5 +17553,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Offentlig transport"
@@ -17440,48 +17595,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Veipunkt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "last inn data fra API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "importerte data fra {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "bytt utvalg"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "bytt arbeidsutsnitt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "Bekreft alle Remote control handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Remote Control tilleggsprogram innstillinger."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17493,34 +17653,34 @@
 "fjernstyring av tilleggsprogrammet."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Bekreft Remote Control handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control har bedt om data fra denne URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control er bedt om å laste data fra API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17743,58 +17903,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Last Kartbilde"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Hent alle kartbilder"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Zoom inn"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Zoom ut"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Tøm bildehurtiglager"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "bilde "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "Automatisk zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "Last kartbilder automatisk"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Innstillinger for SlippyMap programtillegg."
@@ -18082,11 +18242,10 @@
 msgstr "Terasse"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Rediger rørledning"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19169,5 +19328,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19289,59 +19448,59 @@
 msgstr "Overlappende linjer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19824,143 +19983,140 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "opp"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Oppgi brukernavn"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Gjerdetrapp"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19980,7 +20136,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "flerbruk"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20074,12 +20229,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Velg med gitt søkestreng"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Veipunkt"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20096,9 +20249,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Det oppsto en feil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20157,21 +20310,21 @@
 msgstr "Tilpass posisjon på valgt  WMS lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20182,5 +20335,5 @@
 msgstr "Last ned  WMS kartutsnitt fra {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20189,5 +20342,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20195,10 +20348,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20209,24 +20362,24 @@
 "Dette resulterer i feil koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20237,75 +20390,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 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:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatisk nedlasting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åpne tomt WMS lag til data fra fil"
@@ -20374,8 +20551,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Remote Control har bedt om data fra denne URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20887,16 +21063,21 @@
 "samtidig som du drar (generelt tablet-problem i java)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20904,5 +21085,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20910,5 +21091,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20917,5 +21098,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20926,10 +21107,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20937,15 +21118,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20955,5 +21136,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20964,10 +21145,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20976,5 +21157,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20985,15 +21166,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21006,15 +21187,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21023,5 +21204,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21030,5 +21211,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21037,10 +21218,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21051,5 +21232,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21059,5 +21240,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21066,20 +21247,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21088,5 +21269,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21128,4 +21309,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21158,10 +21340,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Ferdselsveier"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Veier"
@@ -21172,5 +21354,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorvei"
@@ -21179,5 +21361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Rediger motorvei"
@@ -21214,10 +21396,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Veinummer"
@@ -21231,8 +21413,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Kjørebaner"
@@ -21251,13 +21433,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Fartsgrense (km/t)"
@@ -21291,17 +21473,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -21338,17 +21520,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21382,17 +21564,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -21423,17 +21605,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Skjæring"
@@ -21464,17 +21646,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Øy"
@@ -21482,5 +21664,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Av-/påkjørsel for motorvei"
@@ -21489,5 +21671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "rediger av-/påkjørsel for motorvei"
@@ -21495,5 +21677,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Stamvei"
@@ -21502,5 +21684,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Rediger stamvei"
@@ -21510,6 +21692,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Motorsykkel"
@@ -21517,5 +21699,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Av-/påkjørsel for stamvei"
@@ -21524,5 +21706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Rediger av-/påkjørsel for stamvei"
@@ -21535,5 +21717,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Riksvei"
@@ -21542,5 +21724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Rediger riksvei"
@@ -21548,10 +21730,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Av-/påkjørsel for riksvei"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Rediger av-/påkjørsel for riksvei"
@@ -21563,5 +21745,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Fylkesvei e.l."
@@ -21571,5 +21753,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Rediger fylkesvei e.l."
@@ -21577,5 +21759,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Kommunal vei"
@@ -21585,5 +21767,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Rediger kommunal vei"
@@ -21595,5 +21777,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Småvei"
@@ -21603,5 +21785,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Rediger småvei"
@@ -21611,6 +21793,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Passeringspunkter"
@@ -21633,15 +21815,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -21653,5 +21835,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Boligfeltvei"
@@ -21660,5 +21842,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Rediger boligfeltvei"
@@ -21678,12 +21860,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Veidekke"
@@ -21705,166 +21887,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "fast dekke"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "uten fast dekke"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "betong"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "skogsområde"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "brostein"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "gress"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "jord"
@@ -21872,5 +22054,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Gatetun"
@@ -21879,5 +22061,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Rediger gatetun"
@@ -21885,5 +22067,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Gågate"
@@ -21892,5 +22074,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Rediger gågate"
@@ -21898,5 +22080,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Adkomstvei"
@@ -21905,5 +22087,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Rediger adkomstvei"
@@ -21913,18 +22095,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Type adkomstvei"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "Smug"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "Oppkjørsel"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -21932,5 +22114,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Parkeringsvei"
@@ -21940,10 +22122,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Rediger parkeringsvei"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Vei (ukjent type)"
@@ -21952,5 +22134,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Rediger vei av ukjent type"
@@ -21958,14 +22140,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Veiarbeid"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Rediger vei under bygging"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Kryss"
@@ -21981,5 +22163,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -21988,5 +22170,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Restriksjoner"
@@ -21995,15 +22177,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Rediger restriksjoner"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Avgift"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Ingen gjennomkjøring"
@@ -22011,5 +22193,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Adkomst"
@@ -22035,4 +22217,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22040,4 +22223,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22113,236 +22302,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privat"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "Skog- og Landbruk"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "leveranse"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nei"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "brukertype"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privat"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "Skog- og Landbruk"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "leveranse"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nei"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "brukertype"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung last (hgv)"
@@ -22357,10 +22553,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Hest"
@@ -22376,10 +22572,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -22394,19 +22591,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Minste fart (km/t)"
@@ -22414,20 +22611,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Maksvekt (tonn)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Makshøyde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Maksbredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Makslengde (meter)"
@@ -22435,5 +22632,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rundkjøring"
@@ -22444,5 +22641,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Rediger kryss"
@@ -22462,10 +22659,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -22487,10 +22684,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -22512,10 +22709,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "riksvei"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
@@ -22537,5 +22734,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22550,9 +22747,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "kommunevei"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "småvei"
@@ -22566,9 +22763,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "boligvei"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "gatetun"
@@ -22612,10 +22809,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "adkomstvei"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "trikkespor"
@@ -22645,5 +22842,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22655,10 +22852,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Rediger bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Rediger tunnel"
@@ -22666,10 +22863,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Mindre veier"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Traktorvei"
@@ -22678,35 +22875,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Rediger traktorvei"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22714,5 +22911,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Sti"
@@ -22721,76 +22918,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Rediger sti"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "middels"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Snøscooter"
@@ -22799,5 +22996,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Dedikert ridevei"
@@ -22805,5 +23002,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Rediger ridevei"
@@ -22811,5 +23008,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Dedikert sykkelvei"
@@ -22827,11 +23024,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Rediger sykkelvei"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22839,5 +23036,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Adskilt gang- og sykkelvei"
@@ -22845,5 +23042,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinert gang- og sykkelvei"
@@ -22851,5 +23048,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Dedikert gangvei"
@@ -22858,5 +23055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
@@ -22864,5 +23061,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Trapper"
@@ -22872,10 +23069,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Antall seter"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -22883,15 +23086,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Service"
@@ -22899,5 +23102,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -22905,10 +23108,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22937,36 +23141,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operatør"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "bekk"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Rediger restaurant"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Nødtelefon"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -22976,5 +23201,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -22983,27 +23208,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "ukontrollert"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "trafikklys"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "trafikkøy"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "umerket"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -23011,6 +23236,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -23019,11 +23244,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -23031,30 +23256,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Full stopp"
@@ -23062,67 +23287,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Fotgjengerfelt"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Rediger fotgjengerfelt"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Type name (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Fartsdemping"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Rediger fartsdemping"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Passeringspunkt"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Rediger passeringspunkt"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -23133,14 +23296,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "med_klokka"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Fotgjengerfelt"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Rediger fotgjengerfelt"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Type name (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Fartsdemping"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Rediger fartsdemping"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Passeringspunkt"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Rediger passeringspunkt"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -23150,5 +23375,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Bygrense"
@@ -23156,15 +23381,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -23173,11 +23398,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Nødtelefon"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Stigning"
@@ -23185,5 +23405,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Sterk stigning"
@@ -23191,5 +23411,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Strøkasse"
@@ -23199,10 +23419,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -23210,5 +23430,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -23216,5 +23436,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -23223,10 +23443,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Høyde"
@@ -23234,5 +23454,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Stengsel"
@@ -23240,5 +23460,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -23246,5 +23466,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -23289,16 +23509,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
@@ -23307,5 +23527,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Steinblokk"
@@ -23313,5 +23533,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -23319,10 +23539,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -23330,15 +23550,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -23346,5 +23566,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -23352,10 +23572,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -23364,5 +23584,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Hekk"
@@ -23373,22 +23593,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Gjerde"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Mur"
@@ -23396,5 +23616,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Bymur"
@@ -23403,5 +23623,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -23412,10 +23632,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
@@ -23423,5 +23643,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Port"
@@ -23429,50 +23649,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -23480,25 +23700,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Rotasjonsport"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Rediger rotasjonsport"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -23506,25 +23726,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Vann"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Vannkilde"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Rediger vannkilde"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Drenering"
@@ -23532,10 +23741,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Dike"
@@ -23543,10 +23752,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Rediger dike"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Bekk"
@@ -23554,10 +23763,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanal"
@@ -23565,10 +23774,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Elv"
@@ -23578,59 +23787,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Rediger elv"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Vannkilde"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Rediger vannkilde"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Foss"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Rediger foss"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Terskeldam"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Rediger terskeldam"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Demning"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Rediger demning"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Basseng"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Rediger basseng"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Drikkevannskilde"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Rediger drikkevannskilde"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Tildekt drikkevannskilde"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Rediger tildekt drikkevannskilde"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Rediger land"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Basseng"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Rediger basseng"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Drikkevannskilde"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Rediger drikkevannskilde"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Tildekt drikkevannskilde"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Rediger tildekt drikkevannskilde"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Kystlinje"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Rediger kystlinje"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -23639,10 +23902,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -23653,14 +23917,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Sumpområde"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "Flytemyr"
@@ -23674,35 +23938,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "myrområde"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "Sivområde"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "Mangrove"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Strand"
@@ -23710,20 +23974,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Klippe"
@@ -23731,145 +23995,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Kystlinje"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Rediger kystlinje"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Handleområde"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Fergeleie"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Rediger fergeleie"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Bil"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "Åpne lag"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "begynner"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "sykkel"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Fergerute"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Skipsverft"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Rediger skipsverft"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Tørrdokk"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Rediger tørrdokk"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Demning"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Rediger demning"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Punkt i vann"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Marina"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Rediger marina"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Brygge"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Rediger brygge"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Sluseport"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Terskeldam"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Rediger terskeldam"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Foss"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Rediger foss"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Snuplass"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Rediger marina"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Brygge"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Rediger brygge"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Fergeleie"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Rediger fergeleie"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Båtslipp"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23879,16 +24214,38 @@
 msgstr "Rediger båtslipp"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Skipsverft"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Rediger skipsverft"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Tørrdokk"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Rediger tørrdokk"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Jernbane"
@@ -23896,5 +24253,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -23924,7 +24281,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23940,8 +24297,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23955,29 +24312,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "Stasjonsområde"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "Sidespor"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "Privat sidespor"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23990,8 +24347,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24062,8 +24419,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24075,8 +24432,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Spenning"
@@ -24089,8 +24446,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -24103,23 +24460,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Rediger smal jernbane"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24127,50 +24484,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Rediger Monorail"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "T-bane"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Trikk"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Rediger trikk"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -24178,5 +24535,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Rediger busspor"
@@ -24185,10 +24542,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
@@ -24197,9 +24554,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Alternative typer"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -24208,5 +24565,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -24215,5 +24572,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -24223,5 +24580,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -24229,5 +24586,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -24236,5 +24593,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24243,10 +24600,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -24254,10 +24611,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -24265,10 +24622,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Taubane"
@@ -24276,10 +24633,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -24287,10 +24644,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24299,5 +24657,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24305,5 +24663,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24312,5 +24670,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24318,5 +24676,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -24326,69 +24684,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24405,34 +24785,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24440,37 +24821,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Åpningstider"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24491,33 +24883,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24526,170 +24920,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "butikk"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Minimarked"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24697,4 +25113,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24706,6 +25123,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkering"
@@ -24714,5 +25131,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -24723,25 +25140,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referansenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "P-hus"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "Overflateparkering"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "P-kjeller"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24750,54 +25169,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Bilforretning"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Rediger bilforretning"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Verksted"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "ja"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Rediger tre"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Koble til {0} …"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Utleie"
@@ -24806,10 +25369,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Bildeling"
@@ -24817,28 +25379,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Rediger sykkelparkering"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Kapasitet"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorsykkel"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Rediger motorvei"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Service"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Lagre"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "land"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Objektmaler"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Klær"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Kapasitet"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Sykkelforretning"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Rediger sykkelforretning"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24848,5 +25469,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24854,5 +25475,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -24860,5 +25481,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -24866,5 +25487,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -24872,5 +25493,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -24879,5 +25500,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -24885,5 +25506,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -24892,5 +25513,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -24902,5 +25523,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -24908,10 +25529,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -24920,10 +25541,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -24932,5 +25553,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -24939,5 +25560,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -24945,5 +25566,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -24953,13 +25574,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Ly"
@@ -24967,19 +25587,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Benk"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -24987,5 +25607,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -24993,5 +25613,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -24999,10 +25619,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Flyplass"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25010,5 +25630,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25016,10 +25636,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25028,5 +25648,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Rullebane"
@@ -25034,5 +25654,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Rediger rullebane"
@@ -25040,5 +25660,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Taksebane"
@@ -25046,5 +25666,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Rediger taksebane"
@@ -25052,5 +25672,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Helikopterdekk"
@@ -25058,5 +25678,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Rediger helikopterdekk"
@@ -25066,5 +25686,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Oppstillingsplass"
@@ -25074,5 +25694,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25083,6 +25703,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -25092,5 +25712,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Vindpølse"
@@ -25099,5 +25719,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -25105,5 +25725,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Rediger terminal"
@@ -25111,15 +25731,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Rediger terminalutgang"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Reise"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Overnatting"
@@ -25131,5 +25751,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -25138,5 +25758,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
@@ -25149,8 +25769,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stjerner"
@@ -25174,34 +25794,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25215,168 +25835,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "stasjon"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motell"
@@ -25384,20 +25909,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -25405,10 +25930,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -25416,30 +25941,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -25447,10 +25973,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -25461,5 +25987,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25467,5 +25993,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -25473,5 +25999,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -25479,79 +26007,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -25559,18 +26087,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25578,10 +26106,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kafé"
@@ -25589,10 +26117,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25600,20 +26133,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -25621,10 +26154,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -25632,25 +26165,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -25658,9 +26191,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -25669,9 +26202,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Temapark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Rediger temapark"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Kunstverk"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Rediger kunstverk"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -25679,50 +26233,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Temapark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Rediger temapark"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Kunstverk"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Rediger kunstverk"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Rediger ly"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Bålplass"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Piknik-sted"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Rediger piknik-sted"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "Topografisk"
@@ -25760,5 +26315,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25766,28 +26321,28 @@
 msgstr "Gater"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "Diagram"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "Sted"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "By"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -25797,5 +26352,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Ruter for:"
@@ -25803,5 +26358,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Tursti"
@@ -25809,6 +26364,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Sykling"
@@ -25816,5 +26371,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Fjellsykling"
@@ -25822,6 +26377,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Ski"
@@ -25829,5 +26384,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Riding"
@@ -25835,46 +26390,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "… andre typer transport mulig"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "Merknad"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "Historisk"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "Dyreliv"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "Planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Veiviser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25883,5 +26438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informasjonsterminal"
@@ -25889,55 +26444,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Lydomviser"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Rediger ly"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Bålplass"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Piknik-sted"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Rediger piknik-sted"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Slott"
@@ -25946,19 +26480,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -25967,9 +26501,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -25977,10 +26511,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Paleontologisk sted"
@@ -25988,5 +26522,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Rediger paleontologisk sted"
@@ -25994,15 +26528,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -26010,55 +26544,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Rediger grensestein"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Lekeplass"
@@ -26066,35 +26600,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -26108,6 +26642,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "velg sport:"
@@ -26523,6 +27057,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26557,240 +27091,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -26807,5 +27341,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26832,23 +27365,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "type"
@@ -26865,5 +27406,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26890,211 +27430,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motorsport"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Rediger motorsport"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -27102,52 +27645,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Skyting"
@@ -27155,204 +27698,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motorsport"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Rediger motorsport"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Advarsel"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Rediger parkering"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Motorkjøretøy"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Rediger motorsport"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Rediger skøyter"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Rediger tollstasjon"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Bil"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Rediger taubane"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Menneskeskapt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Bygning"
@@ -27360,5 +27969,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -27366,10 +27975,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Rådhus"
@@ -27377,10 +27986,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27388,10 +27997,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Domstol"
@@ -27400,10 +28009,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Fengsel"
@@ -27412,10 +28021,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Politi"
@@ -27425,10 +28034,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -27437,10 +28046,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postkontor"
@@ -27448,5 +28057,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -27454,15 +28063,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Skole"
@@ -27470,10 +28079,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universitet"
@@ -27481,10 +28090,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Høyskole"
@@ -27492,5 +28101,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -27498,5 +28107,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kino"
@@ -27505,10 +28114,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bibliotek"
@@ -27517,9 +28126,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -27527,10 +28136,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teater"
@@ -27539,10 +28148,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -27552,5 +28161,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -27559,6 +28168,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -27567,66 +28176,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -27635,189 +28244,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunni"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresser"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Rediger adresseinformasjon"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Husnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Husnavn"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Gatenavn"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "By/sted"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Postnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Landskode"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Rediger interpolasjon"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Nummereringsmåte"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "oddetall"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "partall"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabetisk"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Høyde (meter)"
@@ -27825,25 +28364,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -27851,10 +28390,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -27862,10 +28401,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -27874,41 +28413,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gass"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Område"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -27918,10 +28457,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Kran"
@@ -27929,5 +28468,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Rediger kran"
@@ -27935,10 +28474,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -27946,10 +28485,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -27957,23 +28496,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -27983,35 +28522,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -28020,10 +28559,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -28032,5 +28571,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -28038,10 +28577,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -28052,23 +28591,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -28077,20 +28616,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28098,55 +28637,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "begrenset"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -28155,5 +28694,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -28161,5 +28700,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mynter"
@@ -28167,5 +28706,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Sedler"
@@ -28173,5 +28712,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -28179,5 +28718,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -28185,15 +28724,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -28202,5 +28741,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -28208,35 +28747,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Bokser"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Klær"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Søppeldunk"
@@ -28244,5 +28778,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Rediger søppeldunk"
@@ -28251,31 +28785,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Ryggstø"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "stein"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Farge"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "svart"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "brun"
@@ -28354,5 +28888,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28362,31 +28896,31 @@
 msgstr "grønn"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "hvit"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Antall seter"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -28394,31 +28928,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontene"
@@ -28427,10 +28961,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -28439,10 +28973,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -28451,5 +28985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Rediger hydrant"
@@ -28457,501 +28991,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Til fots"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarked"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Rediger supermarked"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Minimarked"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Rediger minimarked"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Rediger kiosk"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Slakter"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Rediger slakter"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Baker"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Rediger baker"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Økologisk"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Rediger økologisk"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Sprit og vin"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Rediger sprit og vin"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Drikke"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Rediger drikke"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Butikker"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Hygiene"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Rediger hygiene"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Frisør"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Rediger frisør"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Rediger optiker"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Rediger dataelektronikk"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Sko"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Rediger sko"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Friluftsutstyr"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Rediger friluftsutstyr"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Rediger sport"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Renseri"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Rediger renseri"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Vaskeri"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Rediger vaskeri"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "jernbanebro"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Rediger jernbane"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Dataelektronikk"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Rediger dataelektronikk"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronikk"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Rediger elektronikk"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Rediger hifi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Rediger video"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Blomster"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Rediger blomster"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Hagesenter"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Rediger hagesenter"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Jernvarehandel"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Rediger jernvarehandel"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Byggevare"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Rediger byggevare"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Møbler"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Rediger møbler"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Kontor"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Rediger kontor"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Bokhandel"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Rediger bokhandel"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Reisebyrå"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Rediger reisebyrå"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Leker"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Rediger leker"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Automat"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Rediger automat"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Automatprodukter"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "billetter"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "buss-, trikk- og togkart"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "parkeringsbillett"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "mat"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "drikke"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "godter"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "sigaretter"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotografier"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "dyremat"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "aviser"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "leker"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "frimerker"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-kort"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telefonkort"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "kuponger"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "sykkelslanger"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "kondomer"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tamponger"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "hundeposer"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "kundekort"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Valuta"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Bank"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Rediger bank"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Minibank"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Vekslingssted"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Rediger vekslingssted"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Rediger minibank"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Helse"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Lege"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Rediger lege"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Tannlege"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Rediger tannlege"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Apotek"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Rediger apotek"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Reseptlevering"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Sykehus"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Rediger sykehus"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Babyboks"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Rediger babyboks"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Butikker"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Bilforretning"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Rediger bilforretning"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Sykkelforretning"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Rediger sykkelforretning"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarked"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Rediger supermarked"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Hygiene"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Rediger hygiene"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Minimarked"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Rediger minimarked"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Rediger kiosk"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Bokhandel"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Rediger bokhandel"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Reisebyrå"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Rediger reisebyrå"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Slakter"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Rediger slakter"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Baker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Rediger baker"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Blomster"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Rediger blomster"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Økologisk"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Rediger økologisk"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Sprit og vin"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Rediger sprit og vin"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Drikke"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Rediger drikke"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Dataelektronikk"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Rediger dataelektronikk"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronikk"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Rediger elektronikk"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Rediger hifi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Møbler"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Rediger møbler"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Hagesenter"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Rediger hagesenter"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Jernvarehandel"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Rediger jernvarehandel"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Byggevare"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Rediger byggevare"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Kontor"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Rediger kontor"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Frisør"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Rediger frisør"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Sko"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Rediger sko"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Leker"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Rediger leker"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Rediger video"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Renseri"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Rediger renseri"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Vaskeri"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Rediger vaskeri"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Friluftsutstyr"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Rediger friluftsutstyr"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Rediger sport"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Rediger optiker"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Automat"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Rediger automat"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Automatprodukter"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "billetter"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "buss-, trikk- og togkart"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "parkeringsbillett"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "mat"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "drikke"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "godter"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "sigaretter"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotografier"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "dyremat"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "aviser"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "leker"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "frimerker"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-kort"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telefonkort"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "kuponger"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "sykkelslanger"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "kondomer"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tamponger"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "hundeposer"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "kundekort"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Valuta"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Bank"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Rediger bank"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Minibank"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Vekslingssted"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Rediger vekslingssted"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Rediger minibank"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Helse"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Lege"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Rediger lege"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Tannlege"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Rediger tannlege"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Apotek"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Rediger apotek"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Reseptlevering"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Sykehus"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Rediger sykehus"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -28960,5 +29496,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -28967,15 +29503,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -28983,5 +29519,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -28990,368 +29526,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Grenser"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nasjonal"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Rediger landegrense"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Fylkesgrense"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Rediger fylkesgrense"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Kommunegrense"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Rediger kommunegrense"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politisk"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Rediger politisk grense"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Nasjonalpark"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Rediger nasjonalparkgrense"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Steder"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Land"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Rediger land"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Delstat/provins"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Kommune"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Rediger kommune"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Storby"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Rediger storby"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "By"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Rediger by"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Forstad/bydel"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Landsby"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Grend"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Lokalitet"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Fjelltopp"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Rediger fjelltopp"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Isbre"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Rediger isbre"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulkan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Rediger vulkan"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Huleinngang"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Rediger huleinngang"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Øy"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Rediger øy"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Holme"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Rediger holme"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Natur"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Tre"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Rediger tre"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanisk navn"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Skogsområde"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Rediger skogsområde"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "barskog"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "løvskog"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "blandingsskog"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Skog"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Rediger skog"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Naturreservat"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Rediger naturreservat"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Huleinngang"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Rediger huleinngang"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Fjelltopp"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Rediger fjelltopp"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Isbre"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Rediger isbre"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulkan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Rediger vulkan"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Grenser"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nasjonal"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Rediger landegrense"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Fylkesgrense"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Rediger fylkesgrense"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Kommunegrense"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Rediger kommunegrense"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politisk"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Rediger politisk grense"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Nasjonalpark"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Rediger nasjonalparkgrense"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Steinur"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Rediger steinur"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Fjell"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Rediger fjell"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Krattskog"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Rediger krattskog"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Beite"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Rediger beite"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Tre"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Rediger tre"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanisk navn"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Skogsområde"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Rediger skogsområde"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "barskog"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "løvskog"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "blandingsskog"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Skog"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Rediger skog"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Naturreservat"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Rediger naturreservat"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Steinur"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Rediger steinur"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Krattskog"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Rediger krattskog"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Fjell"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Rediger fjell"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Beite"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Rediger beite"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -29360,45 +29902,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -29406,25 +29948,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Friområde"
@@ -29432,10 +29974,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Offentlig"
@@ -29443,20 +29985,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -29464,5 +30006,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -29470,15 +30012,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -29486,9 +30028,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -29496,39 +30038,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -29536,15 +30078,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -29552,52 +30094,183 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Stasjon"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresser"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Rediger adresseinformasjon"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Husnummer"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Husnavn"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Gatenavn"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "By/sted"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Postnummer"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Landskode"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "Ø"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Rediger interpolasjon"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Nummereringsmåte"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "oddetall"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "partall"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabetisk"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Konflikt"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Legg til informasjon om opphavsperson"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Bilde"
 
 #. item "Relations/Multipolygon"
@@ -29605,5 +30278,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -29615,5 +30288,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "ytre linjesegment"
@@ -29621,5 +30294,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -29627,5 +30300,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Grense"
@@ -29636,5 +30309,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Rediger grense"
@@ -29642,36 +30315,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "nasjonal"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "kommunegrense"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "politisk"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Administrativt senter"
@@ -29679,5 +30352,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -29686,5 +30359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -29692,34 +30365,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -29728,15 +30401,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "til linje"
@@ -29744,5 +30417,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Rute"
@@ -29751,5 +30424,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -29757,132 +30430,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Rutetype"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "sykkel"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "ski"
@@ -29950,5 +30512,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29958,9 +30520,9 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "omkjøring"
@@ -29974,10 +30536,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -29985,31 +30547,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Rutetilstand"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -30018,30 +30580,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -34019,7 +34581,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34141,8 +34702,14 @@
 msgstr "Sicilia, Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Behold sikkerhetskopier"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Punkt i vann"
 
 #~ msgid "Move"
@@ -34391,7 +34958,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Synkronisér tidspunkt med GPS-enhet"
-
-#~ msgid "Image"
-#~ msgstr "Bilde"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
@@ -34903,7 +35467,4 @@
 #~ "Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller "
 #~ "intervall, for eksempel nodes:10-20"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Koble til {0} …"
 
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 22859)
+++ applications/editors/josm/i18n/po/nl.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-13 23:47+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 01:18+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-08-20 19:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -255,5 +255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -280,5 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -303,5 +303,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -413,4 +413,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1060,5 +1061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1067,5 +1068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1078,5 +1079,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1482,13 +1483,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1497,5 +1498,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1503,9 +1504,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1513,5 +1514,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1545,8 +1546,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1555,9 +1556,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1573,6 +1574,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1582,5 +1583,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1605,6 +1606,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Fout"
@@ -1766,5 +1767,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Neeêh, Niet doen!"
@@ -2056,5 +2057,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2542,5 +2543,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2584,9 +2585,9 @@
 "Wilt u ze echt verplaatsen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2595,9 +2596,9 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2874,5 +2875,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Zoeken"
@@ -3076,7 +3077,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3347,5 +3348,5 @@
 msgstr[1] "Verplaats {0} knooppunten"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3502,31 +3503,31 @@
 msgstr "Automatische tagcorrectie"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3545,15 +3546,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Configuratiebestand is verminkt in regels {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3562,5 +3563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3569,5 +3570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3576,5 +3577,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3583,5 +3584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3591,5 +3592,5 @@
 "bestand wordt aangemaakt."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3600,5 +3601,5 @@
 "standaard voorkeuren bestand."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3607,5 +3608,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3614,5 +3615,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3621,10 +3622,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3744,5 +3745,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3814,9 +3815,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3824,5 +3825,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4012,14 +4013,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Zwitsers raster (Zwitserland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "zuid"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Spring daarheen"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -4044,9 +4064,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4089,5 +4109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "spoorweg"
@@ -4108,5 +4128,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4363,69 +4383,69 @@
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Gemaximaliseerd openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4435,9 +4455,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4445,52 +4465,61 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initialiseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Hoofdscherm aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Pinpas"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4499,5 +4528,5 @@
 "gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4507,9 +4536,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4523,9 +4552,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4647,23 +4677,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4757,5 +4787,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4763,17 +4793,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4783,25 +4813,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5196,4 +5226,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5276,4 +5307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5290,4 +5322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5361,5 +5394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5371,10 +5404,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "geen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "alles"
@@ -5456,5 +5489,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5466,5 +5499,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5499,17 +5532,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5517,15 +5550,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5533,10 +5566,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5548,5 +5581,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5558,5 +5591,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5701,5 +5734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5814,5 +5847,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5820,5 +5853,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5826,5 +5859,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5832,5 +5865,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5838,5 +5871,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5845,5 +5878,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5851,5 +5884,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5857,5 +5890,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5863,24 +5896,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5901,5 +5934,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5924,37 +5957,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Coördinaten van de nieuwe knoop invoeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Decimale graden gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Graag een geldige breedtegraad in voeren tussen -90 en 90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Graag een breedtegraad invoeren tussen -90 en 90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Graag een geldige lengtegraad invoeren tussen -180 en 180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Graag een lengtegraad invoeren tussen -180 en 180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Sluit het venster en maak een nieuwe knoop"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Sluit het venster zonder een nieuwe knoop te maken"
@@ -6010,9 +6043,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relaties"
@@ -6060,10 +6093,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6083,37 +6116,37 @@
 msgstr "Een selectielijstscherm openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Op selectie inzoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Naar de geselecteerde element(en) zoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6122,27 +6155,27 @@
 msgstr "Selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6151,5 +6184,5 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
@@ -6426,13 +6459,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6544,4 +6577,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6560,6 +6597,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6577,8 +6612,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6589,4 +6631,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6601,33 +6649,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6651,12 +6688,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6728,10 +6775,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6761,8 +6812,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6825,6 +6872,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6877,4 +6922,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6939,32 +6996,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6973,6 +7038,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6981,24 +7048,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7013,82 +7070,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7169,155 +7226,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Naam"
@@ -7741,4 +7803,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<verschillend>"
@@ -8243,17 +8306,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8532,4 +8595,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8537,15 +8601,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Soort"
@@ -8564,16 +8628,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "onbekend"
@@ -9159,5 +9223,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9380,20 +9444,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "laag"
@@ -9843,5 +9907,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Naam: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschrijving: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Beschrijving"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Lengte: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9849,62 +9971,17 @@
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Naam: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschrijving: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Beschrijving"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Lengte: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} route, "
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9914,10 +9991,10 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9928,7 +10005,7 @@
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9936,10 +10013,10 @@
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9947,10 +10024,10 @@
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9958,21 +10035,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9984,9 +10061,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9996,5 +10073,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10004,30 +10081,30 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10035,5 +10112,5 @@
 msgstr "Kleur aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10042,5 +10119,5 @@
 msgstr "Standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10049,18 +10126,18 @@
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10070,23 +10147,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10529,15 +10606,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Geen afbeelding"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "{0} laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11492,4 +11569,49 @@
 msgid "Voice recorder calibration"
 msgstr "Calibratie geluidsopname"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Voorlooptijd (seconden)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Standaardwaarde is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Tijdens het opslaan worden backupbestanden, eindigend op een ~, behouden."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11573,5 +11695,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Auto"
@@ -11590,16 +11712,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Fiets"
@@ -11633,12 +11755,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Te voet"
@@ -11899,18 +12021,18 @@
 msgstr "Standaard (automatisch bepaald)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Ingebouwde standaarden ingeschakelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12228,26 +12350,18 @@
 msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12363,6 +12477,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternatief"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12579,13 +12702,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Backupbestanden behouden"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Tijdens het opslaan worden backupbestanden, eindigend op een ~, behouden."
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12765,5 +12879,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12772,49 +12886,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12824,15 +12938,15 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12842,17 +12956,17 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13460,5 +13574,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13556,5 +13670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13563,5 +13677,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13630,5 +13744,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13638,10 +13752,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13649,5 +13763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13655,5 +13769,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13661,10 +13775,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13672,5 +13786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13678,5 +13792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13684,5 +13798,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13691,10 +13805,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member>-specificatie met ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13702,9 +13816,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13712,11 +13826,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Ongeldig object met id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13728,8 +13842,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13743,5 +13857,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13749,5 +13863,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13756,6 +13870,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13767,6 +13881,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13775,5 +13889,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13781,5 +13895,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13787,12 +13901,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13800,5 +13914,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13808,5 +13922,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13816,5 +13930,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13822,17 +13936,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14335,11 +14449,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14348,16 +14462,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14366,5 +14480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14385,13 +14499,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Niets doen"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Fout melden"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14400,9 +14514,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Er is een onverwachte fout opgetreden"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14410,5 +14524,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14416,5 +14530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14423,5 +14537,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14429,9 +14543,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(De tekst is reeds gekopieerd naar je klembord.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14625,5 +14739,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14676,5 +14790,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14687,5 +14801,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14695,5 +14809,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14704,5 +14818,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: je kunt sneltoetsen in Voorkeuren bewerken.)"
@@ -14803,5 +14917,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14887,10 +15001,61 @@
 msgstr "Sporen naar openstreetmap.org uploaden"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Openingstijden"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Eigenschappen van {0} object aanpassen"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Kies"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Kaart: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Gereedschap: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Snelheid"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -15062,51 +15227,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Kan geen knoop buiten de wereld toevoegen."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' mag niet null zijn"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' mag niet null zijn"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15205,16 +15372,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15228,5 +15387,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15339,5 +15498,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Gebouwen"
@@ -15574,5 +15733,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16000,8 +16159,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16119,6 +16274,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Lege laag"
@@ -17494,5 +17649,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
@@ -17536,48 +17691,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Waypoints"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "gegevens uit API laden"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "gegevens importeren van {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "de selectie aanpassen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "het venster aanpassen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle remote-controlopdrachten handmatig bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Een plugin waarmee JOSM door andere applicaties geregeld kan worden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Afstandsbediening"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Instellingen voor de Afstandsbedieningsplugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17589,35 +17749,35 @@
 "applicaties die met deze plugin communiceren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Toegestane opdrachten"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Wil je dit toestaan?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Remote-controlopdracht bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 "Afstandsbediening is gevraagd gegevens te importeren van de volgende URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Gewenste details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17840,58 +18000,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "auto-zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "auto-laden tegels"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Instellingen voor de Slippy-kaartplugin"
@@ -18175,11 +18335,10 @@
 msgstr "Terras"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Pijplijn bewerken"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19261,5 +19420,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -19381,59 +19540,59 @@
 msgstr "Overlappende wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19927,143 +20086,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "omhoog"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Voer een gebruikersnaam in"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Overstap"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20083,7 +20239,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "Meervoudig"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20177,12 +20332,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Met de opgegeven zoekactie selecteren"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Waypoints"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20199,9 +20352,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Uitzondering opgetreden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20260,21 +20413,21 @@
 msgstr "De positie van de geselecteerde WMS-laag aanpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20285,5 +20438,5 @@
 msgstr "WMS-tegel downloaden van {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20292,5 +20445,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20298,10 +20451,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20313,24 +20466,24 @@
 "Dat kan tot foutieve coördinaten leiden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20341,17 +20494,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20359,58 +20512,82 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatisch downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden"
@@ -20480,9 +20657,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"Afstandsbediening is gevraagd gegevens te importeren van de volgende URL:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20976,16 +21151,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20993,5 +21173,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20999,5 +21179,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21006,5 +21186,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21013,10 +21193,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21024,15 +21204,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21042,5 +21222,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21049,10 +21229,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21061,5 +21241,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21068,15 +21248,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21086,15 +21266,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21103,5 +21283,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21110,5 +21290,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21117,10 +21297,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21129,5 +21309,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21137,5 +21317,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21144,20 +21324,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21166,5 +21346,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21206,4 +21386,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21236,10 +21417,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Straten"
@@ -21250,5 +21431,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autosnelweg"
@@ -21257,5 +21438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Een snelweg bewerken"
@@ -21292,10 +21473,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referentie"
@@ -21309,8 +21490,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Lanen"
@@ -21329,13 +21510,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -21369,17 +21550,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -21416,17 +21597,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21460,17 +21641,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -21501,17 +21682,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Verdieping"
@@ -21542,17 +21723,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Verhoging"
@@ -21560,5 +21741,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Autosnelwegverbinding"
@@ -21567,5 +21748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Een autosnelwegverbinding bewerken"
@@ -21573,5 +21754,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Autoweg"
@@ -21580,5 +21761,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Een autoweg bewerken"
@@ -21588,6 +21769,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21595,5 +21776,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Autowegverbinding"
@@ -21602,5 +21783,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Een autowegverbinding bewerken"
@@ -21613,5 +21794,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Provinciale hoofdweg"
@@ -21620,5 +21801,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Een S-weg bewerken"
@@ -21626,10 +21807,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "S-wegverbinding"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Een S-wegverbinding bewerken"
@@ -21641,5 +21822,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "N-weg>400"
@@ -21649,5 +21830,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Een provinciale weg bewerken"
@@ -21655,5 +21836,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Tweebaansweg"
@@ -21663,5 +21844,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Een tweebaansweg bewerken"
@@ -21673,5 +21854,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Ongeklassificeerd"
@@ -21681,5 +21862,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Een enkelbaansweg bewerken"
@@ -21689,6 +21870,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21711,15 +21892,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -21731,5 +21912,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Woongebied"
@@ -21738,5 +21919,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Een straat bewerken"
@@ -21756,12 +21937,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -21783,166 +21964,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "verhard"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "onverhard"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "oerbos"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "gras"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "zand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "gebied"
@@ -21950,5 +22131,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Woonerf"
@@ -21957,5 +22138,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Een woonerf bewerken"
@@ -21963,5 +22144,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Voetgangers"
@@ -21970,5 +22151,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Voetgangerszone bewerken"
@@ -21976,5 +22157,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Toegangsweg"
@@ -21983,5 +22164,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Een toegangsweg bewerken"
@@ -21991,18 +22172,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "oprit"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -22010,5 +22191,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Parkeergang"
@@ -22018,10 +22199,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Een parkeergang bewerken"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -22030,5 +22211,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -22036,14 +22217,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Werkzaamheden"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Een autosnelweg met werkzaamheden bewerken"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Splitsing"
@@ -22059,5 +22240,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rotonde"
@@ -22066,5 +22247,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
@@ -22073,15 +22254,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
@@ -22089,5 +22270,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Toegang"
@@ -22113,4 +22294,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22118,4 +22300,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22191,236 +22379,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privé"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "toestemming"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "landbouw"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nee"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "bestemmingsverkeer"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privé"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "toestemming"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "landbouw"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nee"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "bestemmingsverkeer"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Goederen"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
@@ -22435,10 +22630,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Ruiters"
@@ -22454,10 +22649,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -22472,19 +22668,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -22492,20 +22688,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Max. hoogte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Max. breedte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Max. lengte (meters)"
@@ -22513,5 +22709,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -22522,5 +22718,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -22540,10 +22736,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autosnelweg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -22565,10 +22761,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "autoweg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -22590,10 +22786,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "provinciale weg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -22615,5 +22811,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22628,9 +22824,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -22644,9 +22840,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "woongebied"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "woonerf"
@@ -22690,10 +22886,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "toegangsweg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -22723,5 +22919,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22733,10 +22929,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -22744,10 +22940,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Wegen"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Track"
@@ -22756,35 +22952,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Track bewerken"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22792,5 +22988,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Pad"
@@ -22799,76 +22995,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Sneeuwscooter"
@@ -22877,5 +23073,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22883,5 +23079,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Ruiterpad bewerken"
@@ -22889,5 +23085,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22905,11 +23101,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Fietspad bewerken"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22917,5 +23113,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22923,5 +23119,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22929,5 +23125,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22936,5 +23132,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
@@ -22942,5 +23138,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Trap"
@@ -22950,10 +23146,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -22961,15 +23162,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Diensten"
@@ -22977,5 +23178,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -22983,10 +23184,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23015,36 +23217,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Bedrijf"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "stroom"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Restaurant bewerken"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Praatpaal"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -23054,5 +23277,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -23061,27 +23284,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "eiland"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "ongemarkeerd"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -23089,6 +23312,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -23097,11 +23320,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -23109,30 +23332,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelicaan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop"
@@ -23140,67 +23363,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Voetgangersoversteekplaats"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -23211,14 +23372,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "met de klok mee"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Voetgangersoversteekplaats"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -23228,5 +23451,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Stadsgrens"
@@ -23234,15 +23457,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
@@ -23251,11 +23474,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Praatpaal"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -23263,5 +23481,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -23269,5 +23487,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23277,10 +23495,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -23288,5 +23506,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -23294,5 +23512,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -23301,10 +23519,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Stijging"
@@ -23312,5 +23530,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barrières"
@@ -23318,5 +23536,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -23324,5 +23542,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -23367,16 +23585,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23385,5 +23603,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Blok"
@@ -23391,5 +23609,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -23397,10 +23615,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -23408,15 +23626,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -23424,5 +23642,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -23430,10 +23648,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -23442,5 +23660,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Haag"
@@ -23451,22 +23669,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Hek"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Muur"
@@ -23474,5 +23692,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -23481,5 +23699,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -23490,10 +23708,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
@@ -23501,5 +23719,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Poort"
@@ -23507,50 +23725,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Overstap"
@@ -23558,25 +23776,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -23584,25 +23802,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Bron"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Bron bewerken"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Sloot"
@@ -23610,10 +23817,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23621,10 +23828,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Stroom"
@@ -23632,10 +23839,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanaal"
@@ -23643,10 +23850,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Rivier"
@@ -23656,59 +23863,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Rivier bewerken"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Bron"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Bron bewerken"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Waterval"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Waterval bewerken"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Stuw"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Stuw bewerken"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Dam"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Dam bewerken"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Estuarium"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Estuarium bewerken"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Reservoir"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Reservoir bewerken"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Ondergronds reservoir"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Ondergronds reservoir bewerken"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Land bewerken"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Estuarium"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Estuarium bewerken"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Reservoir"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Reservoir bewerken"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Ondergronds reservoir"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Ondergronds reservoir bewerken"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Kustlijn"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Kustlijn bewerken"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -23717,10 +23978,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Drasland"
@@ -23731,14 +23993,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "veen"
@@ -23752,35 +24014,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Modder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Strand"
@@ -23788,20 +24050,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Baai"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Klif"
@@ -23809,145 +24071,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Kustlijn"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Kustlijn bewerken"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Winkelen"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Veerbootterminal"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Veerbootterminal bewerken"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Auto"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "beginner"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "fiets"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Veerpontroute"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Scheepswerf"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Scheepswerf bewerken"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dok"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Dok bewerken"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Dam"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Dam bewerken"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Waterwegpunt"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Jachthaven"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Jachthaven bewerken"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Pier"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Pier bewerken"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Sluis"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Stuw"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Stuw bewerken"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Waterval"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Waterval bewerken"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Jachthaven"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Jachthaven bewerken"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Pier"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Pier bewerken"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Veerbootterminal"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Veerbootterminal bewerken"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Trailerhelling"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23957,16 +24290,38 @@
 msgstr "Trailerhelling bewerken"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Scheepswerf"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Scheepswerf bewerken"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dok"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Dok bewerken"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Spoor"
@@ -23974,5 +24329,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -24002,7 +24357,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24018,8 +24373,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24033,29 +24388,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "tuin"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "nevenweg"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "privéoprit"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24068,8 +24423,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24140,8 +24495,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24153,8 +24508,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltage"
@@ -24167,8 +24522,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -24181,23 +24536,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Smalspoor bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24205,50 +24560,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Monorail bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Museumspoor"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Metro bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Tram bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -24256,5 +24611,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Busbaan bewerken"
@@ -24263,10 +24618,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
@@ -24275,9 +24630,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Optionele soorten"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -24286,5 +24641,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -24293,5 +24648,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -24301,5 +24656,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -24307,5 +24662,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -24314,5 +24669,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24321,10 +24676,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -24332,10 +24687,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -24343,10 +24698,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -24354,10 +24709,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24365,10 +24720,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24377,5 +24733,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24383,5 +24739,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24390,5 +24746,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24396,5 +24752,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Brandstof"
@@ -24404,69 +24760,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24483,34 +24861,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24518,37 +24897,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Openingstijden"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24569,33 +24959,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24604,170 +24996,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "winkel"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Verbonden"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24775,4 +25189,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24784,6 +25199,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkeerplaats"
@@ -24792,5 +25207,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -24801,25 +25216,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referentienummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "oppervlak"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24828,54 +25245,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Winkel met autoonderdelen bewerken"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Garage"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "ja"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Boom bewerken"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Verbinden met {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefoonnummer"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Verhuur"
@@ -24884,10 +25445,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Autodelen"
@@ -24895,28 +25455,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Fietsenstalling bewerken"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capaciteit"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorfiets"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Een snelweg bewerken"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Diensten"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Opslaan"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "land"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Voorkeuze"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Kleding"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capaciteit"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Fietswinkel bewerken"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24926,5 +25545,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24932,5 +25551,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -24938,5 +25557,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -24944,5 +25563,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -24950,5 +25569,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -24957,5 +25576,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -24963,5 +25582,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Perron"
@@ -24970,5 +25589,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -24980,5 +25599,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -24986,10 +25605,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -24998,10 +25617,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -25010,5 +25629,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Busstation"
@@ -25017,5 +25636,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -25023,5 +25642,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -25031,13 +25650,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -25045,19 +25663,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Bank"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -25065,5 +25683,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -25071,5 +25689,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -25077,10 +25695,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Luchthaven"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25088,5 +25706,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25094,10 +25712,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25106,5 +25724,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -25112,5 +25730,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -25118,5 +25736,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -25124,5 +25742,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -25130,5 +25748,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25136,5 +25754,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25144,5 +25762,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25152,5 +25770,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -25161,6 +25779,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Baken"
@@ -25170,5 +25788,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25177,5 +25795,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -25183,5 +25801,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -25189,15 +25807,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -25209,5 +25827,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25216,5 +25834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
@@ -25227,8 +25845,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Sterren"
@@ -25252,34 +25870,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25293,168 +25911,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefoonnummer"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -25462,20 +25985,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Chalet"
@@ -25483,10 +26006,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Hostel"
@@ -25494,30 +26017,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -25525,10 +26049,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -25539,5 +26063,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25545,5 +26069,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -25551,5 +26075,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Keuken"
@@ -25557,79 +26083,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25637,18 +26163,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25656,10 +26182,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Café"
@@ -25667,10 +26193,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Kroeg"
@@ -25678,20 +26209,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25699,10 +26230,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -25710,25 +26241,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -25736,9 +26267,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -25747,9 +26278,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Themapark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Themapart bewerken"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Kunstwerk"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Kunstwerk bewerken"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -25757,50 +26309,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Themapark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Themapart bewerken"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Kunstwerk"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Kunstwerk bewerken"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Schuilplaats bewerken"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Vuurplaats"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Picnicplek"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Picnicplek bewerken"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25838,5 +26391,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25844,28 +26397,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25875,5 +26428,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25881,5 +26434,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Wandelen"
@@ -25887,6 +26440,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Fietsen"
@@ -25894,5 +26447,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25900,6 +26453,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skiën"
@@ -25907,5 +26460,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25913,46 +26466,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25961,5 +26514,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25967,55 +26520,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Schuilplaats bewerken"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Vuurplaats"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Picnicplek"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Picnicplek bewerken"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Kasteel"
@@ -26024,19 +26556,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -26045,9 +26577,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -26055,10 +26587,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -26066,5 +26598,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26072,15 +26604,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -26088,55 +26620,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Speelveld"
@@ -26144,35 +26676,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -26186,6 +26718,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -26601,6 +27133,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26635,240 +27167,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -26885,5 +27417,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26910,23 +27441,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "soort"
@@ -26943,5 +27482,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26968,211 +27506,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motorracen"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Motorracen bewerken"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -27180,52 +27721,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Schieten"
@@ -27233,204 +27774,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motorracen"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Motorracen bewerken"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Waarschuwing"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Parkeerplaats bewerken"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Gemotoriseerd verkeer"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Motorracen bewerken"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Schaatsen bewerken"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Grenspost bewerken"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Auto"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Kabinebaan bewerken"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Gebouw"
@@ -27438,5 +28045,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -27444,10 +28051,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -27455,10 +28062,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27466,10 +28073,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -27478,10 +28085,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Gevangenis"
@@ -27490,10 +28097,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Politie"
@@ -27503,10 +28110,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -27515,10 +28122,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -27526,5 +28133,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -27532,15 +28139,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "School"
@@ -27548,10 +28155,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universiteit"
@@ -27559,10 +28166,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Campus"
@@ -27570,5 +28177,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -27576,5 +28183,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -27583,10 +28190,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bibliotheek"
@@ -27595,9 +28202,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -27605,10 +28212,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Theater"
@@ -27617,10 +28224,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -27630,5 +28237,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -27637,6 +28244,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religie"
@@ -27645,66 +28252,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Benaming"
@@ -27713,189 +28320,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adressen"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Adresinformatie bewerken"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Huisnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Huisnaam"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Straatnaam"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Stadsnaam"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Postcode"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Landcode"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Adresinterpolatie bewerken"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Nummeringschema"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "oneven"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "even"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27903,25 +28440,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -27929,10 +28466,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Windmolen"
@@ -27940,10 +28477,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -27952,41 +28489,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Locatie"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -27996,10 +28533,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Kraan"
@@ -28007,5 +28544,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
@@ -28013,10 +28550,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -28024,10 +28561,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -28035,23 +28572,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -28061,35 +28598,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -28098,10 +28635,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -28110,5 +28647,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -28116,10 +28653,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -28130,23 +28667,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -28155,20 +28692,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28176,55 +28713,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefoon"
@@ -28233,5 +28770,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -28239,5 +28776,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Munten"
@@ -28245,5 +28782,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Briefgeld"
@@ -28251,5 +28788,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -28257,5 +28794,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -28263,15 +28800,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recycling"
@@ -28280,5 +28817,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -28286,35 +28823,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Flessen"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Kleding"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28322,5 +28854,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28329,31 +28861,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28432,5 +28964,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28440,31 +28972,31 @@
 msgstr "groen"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -28472,31 +29004,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontein"
@@ -28505,10 +29037,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -28517,10 +29049,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28529,5 +29061,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28535,120 +29067,219 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Te voet"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarkt"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Supermarkt bewerken"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Kiosk bewerken"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Slager"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Slager bewerken"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Bakker"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Bakker bewerken"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr ""
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Dranken"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Winkel met autoonderdelen bewerken"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Fietswinkel bewerken"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarkt"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Supermarkt bewerken"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr ""
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr ""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Kiosk bewerken"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Slager"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Slager bewerken"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Bakker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Bakker bewerken"
-
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Kapper"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Kapper bewerken"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Opticiën bewerken"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Computerwinkel bewerken"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Schoenen"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Schoenenwinkel bewerken"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Buitensport"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Buitensportzaak bewerken"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Sportzaak bewerken"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Stomerij"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Stomerij bewerken"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Wasserette"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Wasserette bewerken"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "spoorovergang"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Spoor bewerken"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Computerwinkel bewerken"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Elektronicawinkel bewerken"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Hifi-winkel bewerken"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Videotheek"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Videotheek bewerken"
+
+#. <separator/>
+#: build/trans_presets.java:2970
 msgid "Florist"
 msgstr "Bloemist"
@@ -28656,193 +29287,85 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2972
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Dranken"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Computerwinkel bewerken"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Elektronicawinkel bewerken"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Hifi-winkel bewerken"
-
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Tuincentrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Tuincentrum bewerken"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Doe-het-zelfzaak"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Doe-het-zelfzaak bewerken"
+
+#: build/trans_presets.java:2998
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2999
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Tuincentrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Tuincentrum bewerken"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Doe-het-zelfzaak"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Doe-het-zelfzaak bewerken"
-
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:3004
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3005
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Kapper"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Kapper bewerken"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Schoenen"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Schoenenwinkel bewerken"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Videotheek"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Videotheek bewerken"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Stomerij"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Stomerij bewerken"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Wasserette"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Wasserette bewerken"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Buitensport"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Buitensportzaak bewerken"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Sportzaak bewerken"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Opticiën bewerken"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -28850,5 +29373,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -28856,97 +29379,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Bank"
@@ -28954,14 +29477,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -28969,5 +29492,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -28975,15 +29498,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "Huisarts"
@@ -28991,18 +29514,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -29010,5 +29533,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -29016,9 +29539,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -29026,10 +29549,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -29038,5 +29572,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -29045,15 +29579,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -29061,5 +29595,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -29068,368 +29602,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Grenzen"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Landsgrens"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Landsgrens bewerken"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Provincie -of gemeentegrens"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Provincie -of gemeentegrens bewerken"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Grens bebouwde kom"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Grens bebouwde kom bewerken"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Grens kiesdistrict bewerken"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr ""
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Grens Nationaal park bewerken"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Locaties"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Land"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Land bewerken"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Provincie"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Regio"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr ""
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr ""
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Stad"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Stad bewerken"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Dorp"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Deelgemeente"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Klein dorp"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Gehucht"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Bergtop"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Bergtop bewerken"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Gletsjer"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Gletsjer bewerken"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulkaan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Vulkaan bewerken"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Grotingang"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Grotingang bewerken"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Eiland"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natuur"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Boom"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Boom bewerken"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanische naam"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Bos"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Bos bewerken"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "naaldbomen"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "loofbomen"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "gemengd"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Bosbouw"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Bosbouw bewerken"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Natuurreservaat"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Natuurreservaat bewerken"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Grotingang"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Grotingang bewerken"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Bergtop"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Bergtop bewerken"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Gletsjer"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Gletsjer bewerken"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulkaan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Vulkaan bewerken"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Grenzen"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Landsgrens"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Landsgrens bewerken"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Provincie -of gemeentegrens"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Provincie -of gemeentegrens bewerken"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Grens bebouwde kom"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Grens bebouwde kom bewerken"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Grens kiesdistrict bewerken"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Grens Nationaal park bewerken"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Puinhelling"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Puinhelling bewerken"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Kreupelhout"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Kreupelhout bewerken"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Heide"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Heide bewerken"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Boom"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Boom bewerken"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanische naam"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Bos"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Bos bewerken"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "naaldbomen"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "loofbomen"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "gemengd"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Bosbouw"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Bosbouw bewerken"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Natuurreservaat"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Natuurreservaat bewerken"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Puinhelling"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Puinhelling bewerken"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Kreupelhout"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Kreupelhout bewerken"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Heide"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Heide bewerken"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -29438,45 +29978,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -29484,25 +30024,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -29510,10 +30050,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Algemeen"
@@ -29521,20 +30061,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -29542,5 +30082,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -29548,15 +30088,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -29564,9 +30104,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -29574,39 +30114,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -29614,15 +30154,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -29630,52 +30170,184 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Attractie"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adressen"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Adresinformatie bewerken"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Huisnummer"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Huisnaam"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Straatnaam"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Stadsnaam"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Postcode"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Landcode"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "O"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "Z"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Adresinterpolatie bewerken"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Nummeringschema"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "oneven"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "even"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Conflict"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Voeg auteursinformatie toe"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "afbeelding"
 
 #. item "Relations/Multipolygon"
@@ -29683,5 +30355,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -29693,5 +30365,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "buitensegment"
@@ -29699,5 +30371,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "binnensegment"
@@ -29705,5 +30377,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29714,5 +30386,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29720,36 +30392,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29757,5 +30429,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -29764,5 +30436,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -29770,34 +30442,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -29806,15 +30478,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "naar weg"
@@ -29822,5 +30494,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29829,5 +30501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29835,132 +30507,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "fiets"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -30028,5 +30589,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30036,9 +30597,9 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "omweg"
@@ -30052,10 +30613,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -30063,31 +30624,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -30096,30 +30657,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34097,7 +34658,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34219,9 +34779,15 @@
 msgstr "Sicilië - Italië"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
 
+#~ msgid "Keep backup files"
+#~ msgstr "Backupbestanden behouden"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Waterwegpunt"
+
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecteer eerst een bladwijzer."
@@ -34232,9 +34798,4 @@
 #~ msgid "No images with readable timestamps found."
 #~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "afbeelding"
-#~ msgstr[1] "afbeeldingen"
 
 #~ msgid "Unknown version"
@@ -34859,7 +35420,4 @@
 #~ msgstr "E-mail"
 
-#~ msgid "Contact {0}..."
-#~ msgstr "Verbinden met {0}..."
-
 #~ msgid "No data imported."
 #~ msgstr "Geen gegevens geïmporteerd."
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 22859)
+++ applications/editors/josm/i18n/po/pl.po	(revision 22863)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-17 06:19+0000\n"
-"Last-Translator: Rafał <Unknown>\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-28 22:04+0000\n"
+"Last-Translator: Paweł Marynowski <yarl@o2.pl>\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-08-20 19:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -79,5 +79,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -98,5 +98,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Uwaga"
@@ -124,9 +124,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "OpenStreetMap - Edytor Java"
@@ -134,5 +134,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -257,5 +257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -282,5 +282,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -305,5 +305,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -414,4 +414,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -429,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1057,5 +1058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1064,5 +1065,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1075,5 +1076,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1361,5 +1362,5 @@
 "<html>Używasz projekcji EPSG:4326 co może prowadzić<br>do nizamierzonych "
 "efektów przy wyrównywaniu obiektów.<br>Zmień projekcję aby usunąć to "
-"ostrzeżenie.<br>Kontynuujesz?</html>"
+"ostrzeżenie.<br>Czy chcesz kontynuować?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1469,13 +1470,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1484,5 +1485,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1490,9 +1491,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1500,5 +1501,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1532,8 +1533,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1542,9 +1543,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1560,6 +1561,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1569,5 +1570,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1592,6 +1593,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Błąd"
@@ -1752,5 +1753,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Nie, przerwij"
@@ -2032,5 +2033,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2517,5 +2518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2559,9 +2560,9 @@
 "Czy na pewno je przesunąć?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Zwolnij przycisk myszki, aby zaznaczyć obiekty w kwadracie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2570,9 +2571,9 @@
 "najbliższym węzłem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2837,5 +2838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Szukaj"
@@ -3028,7 +3029,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3299,5 +3300,5 @@
 msgstr[2] "Przesunięto {0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3454,31 +3455,31 @@
 msgstr "Automatyczna korekcja tagów"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3497,15 +3498,15 @@
 msgstr "Niewłaściwa wartość długości geograficznej \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Błąd w pliku konfiguracyjnym w linii {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3516,5 +3517,5 @@
 "jest folderem."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3525,5 +3526,5 @@
 "folderem.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3534,5 +3535,5 @@
 "brakującego katalogu ustawień: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3543,5 +3544,5 @@
 "katalogu ustawień: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3550,5 +3551,5 @@
 "Ostrzeżenie: Brak pliku ustawień''{0}''. Tworzenie pliku ustawień domyślnych."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3559,5 +3560,5 @@
 "domyślnych."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3568,5 +3569,5 @@
 "ustawień domyślnych: {0} </ html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3577,5 +3578,5 @@
 "<br> {0} <br> i tworzenia nowego pliku ustawień domyślnych.</ html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3586,10 +3587,10 @@
 "Nie udało się przywrócić pliku ustawień domyślnych: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3709,5 +3710,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3782,9 +3783,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Element z ID = 0 nie może być niewidoczny"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3792,5 +3793,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3983,14 +3984,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "południe"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Przejdź"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -4015,9 +4035,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4060,5 +4080,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "tory kolejowe"
@@ -4079,5 +4099,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4328,69 +4348,69 @@
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Zmień folder dla ustawień wszystkich użytkowników."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4400,9 +4420,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4410,57 +4430,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Inicjalizacja"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+msgstr "Niezapisane dane OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
-msgstr ""
+msgstr "Przywróć"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "na karty debetowe"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+"JOSM znalazł {0} niezapisanych warstw danych. Wygląda na to, że program "
+"ostatnio się zawiesił. Czy chcesz odtworzyć dane?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+msgstr "Ustawienie {0} zostało usunięte, ponieważ nie jest już używane."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4469,12 +4502,15 @@
 "version of JOSM.</li></ul>More Info:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+"<h2>JOSM wymaga Javy w wersji 6.</h2>Wykryta wersja Javy: {0}.<br>Możesz "
+"<ul><li>zaktualizować swoją Javę (JRE) lub</li><li>używać starszych wersji "
+"JOSM (Kompatybilnych z Java 5).</li></ul>Więcej informacji:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgstr "Zamknij JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
-msgstr ""
+msgstr "Kontynuuj mimo to"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
@@ -4486,9 +4522,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4610,23 +4647,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "warstwa nie jest na liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4724,5 +4761,5 @@
 msgstr "Kliknij aby zamknąć i anulować usuwanie obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4732,17 +4769,17 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Poziom powiększenia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "od kafelka"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "aż do kafelka"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4756,25 +4793,25 @@
 "obsługiwane.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Adres kafelka:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Wprowadzona wartość nie jest poprawnym adresem kafelka"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5179,4 +5216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5259,4 +5297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5273,4 +5312,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5344,5 +5384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5354,10 +5394,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "wszystkie"
@@ -5439,5 +5479,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5450,5 +5490,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5484,17 +5524,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Rola:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Wprowadź rolę dla wszystkich członków relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5502,16 +5542,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Klucz:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Wprowadź klucz dla tagu np. <strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
 #: ../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>Wprowadź klucz dla tagu np. <strong><tt>fixme</tt></strong></html>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5519,5 +5559,5 @@
 msgstr "Wartość:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5526,5 +5566,5 @@
 "tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5542,5 +5582,5 @@
 "połączona droga zastępuje pierwotne drogi w relacji</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5552,5 +5592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Zastosuj tę rolę do wszystkich członków"
@@ -5693,5 +5733,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5713,9 +5753,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237
 msgid "Close anyway"
-msgstr ""
+msgstr "Zamknij mimo to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
 msgid "Continue resolving"
-msgstr ""
+msgstr "Kontynuuj rozwiązywanie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240
@@ -5731,14 +5771,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Konflikt nie został całkowicie rozwiązany"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281
 msgid "Resolve conflicts"
-msgstr ""
+msgstr "Rozwiąż konflikty"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Rozwiąż konflikty dla \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
@@ -5804,5 +5844,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5810,5 +5850,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5816,5 +5856,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5822,5 +5862,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5828,5 +5868,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5835,5 +5875,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5841,5 +5881,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5847,5 +5887,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5853,24 +5893,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtr aktywny</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> ukrytych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> wyłączonych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
@@ -5891,5 +5931,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5914,37 +5954,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Podaj współrzędne nowego węzła."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Użyj stopni dziesiętnych."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Wartości ujemne oznaczają zachodnią/południową półkulę."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Wprowadź prawidłową szerokość geograficzną z zakresu -90..90 stopni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Wprowadź szerokość geograficzną z zakresu -90..90 stopni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Wprowadź prawidłową długość geograficzną z zakresu -180..180 stopni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Wprowadź długość geograficzną z zakresu -180..180 stopni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Zamknij okno i utwórz nowy węzeł"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Zamknij okno, nie twórz nowego węzła"
@@ -6000,9 +6040,9 @@
 msgstr "Informacje o warstwie"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relacje"
@@ -6050,10 +6090,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Pobierz niekompletnych członków zaznaczonych relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Pobierz niekompletnych członków"
@@ -6073,37 +6113,37 @@
 msgstr "Otwiera okno z listą zaznaczonych obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Wyszukuje obiekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Powiększ do zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Powiększ do wybranych elementów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Zaznacz na liście relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6112,27 +6152,27 @@
 msgstr "Zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Zaznaczenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Oderwij panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6140,5 +6180,5 @@
 "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela"
@@ -6417,13 +6457,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Zawartość tego zestawu zmian nie została jeszcze pobrana."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Pobierz teraz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr ""
@@ -6535,4 +6575,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6551,6 +6595,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6568,8 +6610,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6580,4 +6629,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6592,33 +6647,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6642,12 +6686,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6719,10 +6773,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6752,8 +6810,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6816,6 +6870,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6868,4 +6920,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6930,32 +6994,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6964,6 +7036,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6972,24 +7046,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7004,82 +7068,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7160,155 +7224,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nazwa"
@@ -7735,4 +7804,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<różne>"
@@ -8243,17 +8313,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8533,4 +8603,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8538,15 +8609,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Rodzaj"
@@ -8565,16 +8636,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "nieznany"
@@ -9142,5 +9213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9366,20 +9437,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Warstwa"
@@ -9829,11 +9900,6 @@
 msgstr[2] "{0} obiektów do usunięcia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr "punkt GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9841,5 +9907,6 @@
 msgstr "Nazwa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9847,5 +9914,5 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -9856,23 +9923,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr "Zakres czasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr "Długość"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
 msgstr "Długość: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -9882,5 +9952,6 @@
 msgstr[2] "{0} tras, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -9890,10 +9961,24 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr "punkt GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} ścieżka"
+msgstr[1] "{0} ścieżki"
+msgstr[2] "{0} ścieżki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9903,10 +9988,10 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9917,7 +10002,7 @@
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9925,10 +10010,10 @@
 msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9936,10 +10021,10 @@
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9947,21 +10032,21 @@
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9973,5 +10058,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -9979,5 +10064,5 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9985,5 +10070,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9991,30 +10076,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Użyj ustawień globalnych."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Wybierz opcje rysowania linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10022,5 +10107,5 @@
 msgstr "Dostosuj kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10029,5 +10114,5 @@
 msgstr "Domyślny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10036,18 +10121,18 @@
 msgstr "Wybierz kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Znaczniki nazwanych punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nazwane punkty GPS z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importuj dźwięk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10060,23 +10145,23 @@
 "nimi dźwięku.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import nie jest możliwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Pliki audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Markery audio z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importuj obrazki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10519,15 +10604,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Brak obrazu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Wczytywanie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11210,5 +11295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
-msgstr ""
+msgstr "Uruchom ponownie"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
@@ -11465,4 +11550,49 @@
 msgid "Voice recorder calibration"
 msgstr "Kalibracja urządzenia nagrywającego"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Czas pomiędzy aktualizacjami (w dniach):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Domyślną wartością jest \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Podczas zapisywania, pozostawia kopie zapasowe pliku dodając ~ do nazwy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11546,5 +11676,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Samochód"
@@ -11563,16 +11693,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Rowery"
@@ -11606,12 +11736,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Ruch pieszy"
@@ -11868,18 +11998,18 @@
 msgstr "Domyślny (ustalony automatycznie)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Używany styl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Style rysowania map"
@@ -12204,26 +12334,18 @@
 msgstr "Projekcja {0} nie może zostać aktywowana. Używam Mercatora."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12339,6 +12461,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternatywny"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12558,13 +12689,4 @@
 "authentication method ''Basic Authentication''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Pozostawiaj kopie zapasowe plików"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Podczas zapisywania, pozostawia kopie zapasowe pliku dodając ~ do nazwy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
@@ -12752,5 +12874,5 @@
 msgstr "Dodaje nowy tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12759,49 +12881,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Więcej informacji na temat tej funkcji"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Dostępne role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "rola"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "liczba"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "elementy"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Dodatkowe atrybuty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Nieznany typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12811,15 +12933,15 @@
 msgstr "Nie można odczytać źródła szablonów: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Błąd podczas przetwarzania {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12830,17 +12952,17 @@
 msgstr[2] "Zmień {0} obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nic nie wybrano!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12859,5 +12981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Search preset"
-msgstr ""
+msgstr "Szukaj szablon"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13448,5 +13570,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13544,5 +13666,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13551,5 +13673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13620,5 +13742,5 @@
 msgstr "Plik ''{0}'' nie istnieje."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13628,10 +13750,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13639,5 +13761,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13645,5 +13767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13651,10 +13773,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13662,5 +13784,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13668,5 +13790,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13674,5 +13796,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13681,10 +13803,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Niekompletny opis <member> z ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13692,9 +13814,9 @@
 msgstr "Usunięta relacja {0} zawiera członki"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13702,11 +13824,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Niedozwolony obiekt z id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13718,8 +13840,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13733,5 +13855,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13739,5 +13861,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13746,6 +13868,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13757,6 +13879,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13765,5 +13887,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13771,5 +13893,5 @@
 msgstr "Brakuje wymaganego atrybutu ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13777,12 +13899,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13790,5 +13912,5 @@
 msgstr "Usunięty węzeł {0} jest częścią drogi {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13798,5 +13920,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13806,5 +13928,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13812,17 +13934,17 @@
 msgstr "Usunięty członek {0} jest użyty w relacji {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Przygotowywanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Analizowanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Przygotowanie zestawu danych..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14340,11 +14462,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14353,16 +14475,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14371,5 +14493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14390,13 +14512,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Nic nie rób"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Zgłoś błąd"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14405,9 +14527,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Nieoczekiwany błąd"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14417,5 +14539,5 @@
 "najnowszą wersję JOSM dostępną tutaj:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14425,5 +14547,5 @@
 "nie pomaga prosimy o zgłoszenie błędu w naszym systemie za pomocą tego linku:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14432,5 +14554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14438,9 +14560,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Tekst już został skopiowany do schowka.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14638,5 +14760,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14690,5 +14812,5 @@
 msgstr "nieużywane"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14701,5 +14823,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14709,5 +14831,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14718,5 +14840,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Podpowiedź: Możesz zmienić skróty klawiszowe w ustawieniach.)"
@@ -14817,5 +14939,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Widoczność"
@@ -14901,10 +15023,61 @@
 msgstr "Wysyła ślady do openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Godziny otwarcia"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Zmiana właściwości {0} obiektu."
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Wybierz"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Mapa: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Narzędzie: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "otwarty"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -15076,51 +15249,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Nie można dodać węzła poza granicami świata."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15219,16 +15394,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15242,5 +15409,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15353,5 +15520,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Budynki"
@@ -15588,5 +15755,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15865,5 +16032,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:32
 msgid "Contacting WMS Server..."
-msgstr ""
+msgstr "Łączenie z serwerem WMS..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:166
@@ -15896,5 +16063,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:33
 msgid "Contacting cadastre WMS ..."
-msgstr ""
+msgstr "Łączenie z katastrem WMS..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:40
@@ -16001,8 +16168,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16116,6 +16279,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Pusta warstwa"
@@ -17473,5 +17636,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Transport publiczny"
@@ -17515,48 +17678,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Punkty drogowe"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17565,34 +17732,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17815,58 +17982,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Mapa \"Slippy\""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -18150,11 +18317,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Edycja rurociągu"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19236,5 +19402,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19354,59 +19520,59 @@
 msgstr "Nakładające się drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Nieustalony rodzaj relacji"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Problem z weryfikacją roli"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr ""
@@ -19887,143 +20053,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "do góry"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Podaj nazwę użytkownika"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "przełaz"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20043,7 +20206,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "różne sporty"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20141,7 +20303,6 @@
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Punkty drogowe"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20158,9 +20319,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Wystąpił wyjątek"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20219,21 +20380,21 @@
 msgstr "Dostosowuje pozycję wybranej warstwy WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20244,5 +20405,5 @@
 msgstr "Pobiera kafelki WMS z {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20251,5 +20412,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20257,10 +20418,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20271,24 +20432,24 @@
 "Może to spowodować powstanie błędnych współrzędnych."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Warstwa WMS ({0}), automatycznie pobrana w powiększeniu {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Warstwa WMS ({0}), pobrana w powiększeniu {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20299,75 +20460,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Pobierz widoczne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Zmień rozdzielczość"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Wczytaj ponownie błędne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Kanał alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Zapisz warstwę WMS do pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Zapisz plik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Otwórz warstwę WMS z pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Otwórz warstwę WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nieosługiwana wersja pliku WMS; znaleziono {0}, oczekiwano {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Ustaw zakładkę WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatyczne pobieranie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Tworzy pustą warstwę WMS do załadowania danych z pliku"
@@ -20928,16 +21113,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje zgłoszone problemy z OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20945,5 +21135,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20951,5 +21141,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20958,5 +21148,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20965,10 +21155,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20976,15 +21166,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Pozwala wysyłać innym aplikaciom polecenia do JOSM"
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20994,5 +21184,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21001,10 +21191,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21013,5 +21203,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21020,15 +21210,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21038,15 +21228,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21055,5 +21245,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21062,5 +21252,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21069,10 +21259,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21081,5 +21271,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21089,5 +21279,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21098,20 +21288,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21120,5 +21310,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21160,4 +21350,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21190,10 +21381,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Drogi"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Sieć drogowa"
@@ -21204,5 +21395,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "autostrada"
@@ -21211,5 +21402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Edycja autostrady"
@@ -21246,10 +21437,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Numer"
@@ -21263,8 +21454,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Liczba pasów ruchu"
@@ -21283,15 +21474,15 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
-msgstr "Max. prędkość (km/h)"
+msgstr "Maks. prędkość (km/h)"
 
 #. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
@@ -21323,17 +21514,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "jednokierunkowa"
@@ -21370,17 +21561,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21414,17 +21605,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "tunel"
@@ -21455,17 +21646,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "wykop"
@@ -21496,17 +21687,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "nasyp"
@@ -21514,5 +21705,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "autostrada - dojazd"
@@ -21521,5 +21712,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Edycja dojazdu do autostrady"
@@ -21527,5 +21718,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "droga ekspresowa"
@@ -21534,5 +21725,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Edycja drogi ekspresowej"
@@ -21542,6 +21733,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21549,5 +21740,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "droga ekspresowa - dojazd"
@@ -21556,5 +21747,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Edycja dojazdu do drogi ekspresowej"
@@ -21567,5 +21758,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "droga krajowa"
@@ -21574,5 +21765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Edycja drogi krajowej"
@@ -21580,10 +21771,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "droga krajowa - dojazd"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Edycja dojazdu do drogi krajowej"
@@ -21595,5 +21786,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "droga wojewódzka"
@@ -21603,5 +21794,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Edycja drogi wojewódzkiej"
@@ -21609,5 +21800,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "droga powiatowa"
@@ -21617,5 +21808,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Edycja drogi powiatowej"
@@ -21627,5 +21818,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "droga gminna"
@@ -21635,5 +21826,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Edycja drogi gminnej lub innej drogi publicznej"
@@ -21643,6 +21834,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "zatoki dla wymijania"
@@ -21665,15 +21856,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
@@ -21685,5 +21876,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "droga lokalna"
@@ -21692,5 +21883,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Edycja drogi lokalnej / ulicy"
@@ -21710,12 +21901,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Nawierzchnia"
@@ -21737,166 +21928,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "utwardzona"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "nieutwardzona"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "drewno"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "kostka"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "bruk"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "żwir"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "kamienie"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "szuter"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "kratka trawnikowa"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "trawa"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "piach"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "grunt"
@@ -21904,5 +22095,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "strefa zamieszkania"
@@ -21911,5 +22102,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Edycja strefy zamieszkania"
@@ -21917,5 +22108,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "ciąg pieszy"
@@ -21924,5 +22115,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Edycja ciągu pieszego"
@@ -21930,5 +22121,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "droga serwisowa"
@@ -21937,5 +22128,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Edycja drogi serwisowej"
@@ -21945,18 +22136,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Rodzaj"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "alejka"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "podjazd"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "wysepka parkignowa"
@@ -21964,5 +22155,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "uliczka parkingowa"
@@ -21972,10 +22163,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Edycja uliczki parkingowej"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "droga (nieokreślona)"
@@ -21984,5 +22175,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Edycja drogi nieokreślonego rodzaju"
@@ -21990,14 +22181,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "w budowie"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Edycja drogi w budowie"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Skrzyżowanie"
@@ -22013,5 +22204,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rondo"
@@ -22020,5 +22211,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "ograniczenia na drodze"
@@ -22027,15 +22218,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Edycja ograniczeń na drodze"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "bramka (opłata)"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "ślepa ulica"
@@ -22043,5 +22234,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Dostęp do drogi"
@@ -22067,4 +22258,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22072,4 +22264,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22145,236 +22343,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "droga prywatna"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "dopuszczalny"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "dla rolnictwa"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nie"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "dla wyznaczonych pojazdów"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "droga prywatna"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "dopuszczalny"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "dla rolnictwa"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nie"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "dla wyznaczonych pojazdów"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Zaopatrzenie"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Samochody dostawcze"
@@ -22389,10 +22594,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Konie"
@@ -22408,10 +22613,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocykle"
@@ -22426,19 +22632,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Samochody"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport publiczny"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. prędkość (km/h)"
@@ -22446,20 +22652,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
-msgstr "Max. ciężar (w tonach)"
+msgstr "Maks. ciężar (w tonach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Maks. wysokość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Maks. szerokość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Maks. długość (w metrach)"
@@ -22467,5 +22673,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "rondo"
@@ -22476,5 +22682,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Edycja skrzyżowania"
@@ -22494,10 +22700,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "ciąg pieszy"
@@ -22519,10 +22725,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "droga ekspresowa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "droga ekspresowa - dojazd"
@@ -22544,10 +22750,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "droga krajowa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "droga krajowa - dojazd"
@@ -22569,5 +22775,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22582,9 +22788,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "droga powiatowa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "droga gminna"
@@ -22598,9 +22804,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "droga lokalna"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "strefa zamieszkania"
@@ -22644,10 +22850,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "droga serwisowa"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "wydzielony pas autobusowy"
@@ -22677,5 +22883,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22687,10 +22893,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Edycja mostu"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Edycja tunelu"
@@ -22698,10 +22904,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Drogi"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "droga gruntowa"
@@ -22710,35 +22916,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Edycja drogi gruntowej"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Typ drogi"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Skala MTB"
@@ -22746,5 +22952,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "ścieżka"
@@ -22753,76 +22959,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Edycja ścieżki"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Skala SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "doskonała"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "dobra"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "średnia"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "zła"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "tragiczna"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:500
+msgstr "Wózki inwalidzkie"
+
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Narty"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Skuter śnieżny"
@@ -22831,5 +23037,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "ścieżka do jazdy konnej"
@@ -22837,5 +23043,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Edycja ścieżki do jazdy konnej"
@@ -22843,5 +23049,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "ścieżka rowerowa"
@@ -22859,11 +23065,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Edycja ścieżki rowerowej"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22871,5 +23077,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "rozdzielona ścieżka dla pieszych i rowerowa"
@@ -22877,5 +23083,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "współdzielona ścieżka dla pieszych i rowerowa"
@@ -22883,5 +23089,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "ścieżka dla pieszych"
@@ -22890,5 +23096,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Edycja ścieżki dla pieszych"
@@ -22896,5 +23102,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "schody"
@@ -22904,10 +23110,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Edycja schodów"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Pojemność"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "skrzyżowanie autostrad"
@@ -22915,15 +23127,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Edycja skrzyżowania autostrad"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Numer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "miejsce obsługi podróżnych"
@@ -22931,5 +23143,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Edycja miejsca obsługi podróżnych"
@@ -22937,10 +23149,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22969,36 +23182,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operator"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Przywróć"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Edycja restauracji"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "telefon alarmowy"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "sygnalizacja świetlna"
@@ -23008,5 +23242,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Typ przejścia dla pieszych"
@@ -23015,27 +23249,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "sygnalizacja świetlna"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "wysepka"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "nieoznakowane"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -23043,6 +23277,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -23051,11 +23285,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "opiekun na przejściu dla pieszych"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Rodzaj przejścia dla pieszych (UK)"
@@ -23063,30 +23297,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "znak stop"
@@ -23094,67 +23328,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "przejście dla pieszych"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Edycja przejścia dla pieszych"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "środek uspokojenia ruchu"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Edycja środka uspokojenia ruchu"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "zatoka"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Edycja zatoki"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "minirondo"
@@ -23165,14 +23337,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Kierunek"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "zgodnie z ruchem wskazówek zegara"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "przejście dla pieszych"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Edycja przejścia dla pieszych"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "środek uspokojenia ruchu"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Edycja środka uspokojenia ruchu"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "zatoka"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Edycja zatoki"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "miejsce do zawracania"
@@ -23182,5 +23416,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "granica miasta"
@@ -23188,15 +23422,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Edycja tablicy oznaczającej granicę miasta"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Druga nazwa"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "fotoradar"
@@ -23205,11 +23439,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "telefon alarmowy"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "nachylenie drogi"
@@ -23217,5 +23446,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "duże nachylenie drogi"
@@ -23223,5 +23452,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "kontener z piaskiem"
@@ -23231,10 +23460,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "bród"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Edycja brodu"
@@ -23242,5 +23471,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "przełęcz"
@@ -23248,5 +23477,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Edycja przełęczy"
@@ -23255,10 +23484,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Wysokość"
@@ -23266,5 +23495,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Przeszkody"
@@ -23272,5 +23501,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "słupek drogowy"
@@ -23278,5 +23507,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Edycja słupka drogowego"
@@ -23321,16 +23550,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Dozwolony ruch:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "przegroda dla rowerzystów"
@@ -23339,5 +23568,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "betonowy blok"
@@ -23345,5 +23574,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "przeszkoda dla bydła"
@@ -23351,10 +23580,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Edycja przeszkody dla bydła"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23362,15 +23591,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "kolczatka"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Edycja kolczatki"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "punkt poboru opłat"
@@ -23378,5 +23607,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Edycja punktu poboru opłat"
@@ -23384,10 +23613,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "przejście graniczne"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Edycja przejścia granicznego"
@@ -23396,5 +23625,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "żywopłot"
@@ -23405,22 +23634,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "ogrodzenie"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "mur"
@@ -23428,5 +23657,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "mury miejskie"
@@ -23435,5 +23664,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "mur oporowy"
@@ -23444,10 +23673,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "wejście"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Edycja wejścia"
@@ -23455,5 +23684,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "brama"
@@ -23461,50 +23690,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Edycja bramy"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "szlaban"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Edycja szlabanu"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "przełaz"
@@ -23512,25 +23741,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Edycja przełazu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "kołowrotek"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Edycja kołowrotka"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "brama warowna"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Edycja bramy warownej"
@@ -23538,25 +23767,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Woda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "źródło"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "plaża"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "odpływ"
@@ -23564,10 +23782,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Edycja odpływu"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "rów"
@@ -23575,10 +23793,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Edytuj rów"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "strumień"
@@ -23586,10 +23804,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Edycja strumienia"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "kanał"
@@ -23597,10 +23815,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Edycja kanału"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "rzeka"
@@ -23610,59 +23828,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Edycja rzeki"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "źródło"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "plaża"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "wodospad"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Edycja wodospadu"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "jaz"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Edycja jazu"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "tama"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Edycja tamy"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "zbiornik wodny"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Edycja zbiornika wodnego"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "sztuczne jezioro"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Edycja sztucznego jeziora"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "zakryte sztuczne jezioro"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Edycja zakrytego sztucznego jeziora"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "ląd (wyspa)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Edycja lądu"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "zbiornik wodny"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Edycja zbiornika wodnego"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "sztuczne jezioro"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Edycja sztucznego jeziora"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "zakryte sztuczne jezioro"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Edycja zakrytego sztucznego jeziora"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "wybrzeże"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Edycja zbiornika gazu"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "koryto rzeczne"
@@ -23671,10 +23943,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Edycja koryta rzecznego"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "mokradło"
@@ -23685,14 +23958,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Edycja mokradła"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "bagno"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "torfowisko"
@@ -23706,35 +23979,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsze"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "szuwary"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "tereny zalewowe"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "namorzyny"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "błota"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Edycja błot"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "plaża"
@@ -23742,20 +24015,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Edycja plaży"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "zatoka"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Edycja zatoki"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "klif"
@@ -23763,145 +24036,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Edycja klifu"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "wybrzeże"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Edycja zbiornika gazu"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Zakupy"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "terminal promowy"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Edycja terminalu promowego"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Samochód"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "dla początkujących"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "trasa promu"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Edycja trasy promu"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "stocznia"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Edycja stoczni"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "dok"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Edycja doku"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "tama"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Edycja tamy"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Punkty drogi wodnej"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "marina"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Edycja mariny"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "molo"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Edycja molo"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "wrota śluzy"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "jaz"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Edycja jazu"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "wodospad"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Edycja wodospadu"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Edycja mariny"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "molo"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Edycja molo"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "terminal promowy"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Edycja terminalu promowego"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "pochylnia"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23911,16 +24255,38 @@
 msgstr "Edycja pochylni"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "stocznia"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Edycja stoczni"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "dok"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Edycja doku"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Kolej"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "tor"
@@ -23928,5 +24294,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Edycja toru"
@@ -23956,7 +24322,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Rozstaw toru (mm)"
@@ -23972,8 +24338,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Rodzaj"
@@ -23987,29 +24353,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "dworzec przetokowy"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "bocznica"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "odnoga"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elektryfikacja"
@@ -24022,10 +24388,10 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
-msgstr ""
+msgstr "sieć trakcyjna"
 
 #. color foot
@@ -24094,8 +24460,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24107,8 +24473,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Napięcie"
@@ -24121,8 +24487,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Częstotliwość (Hz)"
@@ -24135,23 +24501,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "kolej wąskotorowa"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edycja toru kolei wąskotorowej"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "tor jednoszynowy"
@@ -24159,50 +24525,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Edycja toru jednoszynowego"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "kolej retro"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Edycja kolei retro"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "trasa szybkiego tramwaju"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Edycja trasy szybkiego tramwaju"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Edycja toru metra"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "tramwaj"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Edycja torów tramwajowych"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "autobus torowy"
@@ -24210,5 +24576,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Edycja autobusu torowego"
@@ -24217,10 +24583,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "nieużywany tor"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Edycja opuszczonych torów"
@@ -24229,9 +24595,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Rodzaj (opcjonalne)"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "nieczynny tor"
@@ -24240,5 +24606,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "przejazd kolejowy"
@@ -24247,5 +24613,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "przejazd przez tory"
@@ -24255,5 +24621,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Rodzaj przejazdu"
@@ -24261,5 +24627,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "obrotnica"
@@ -24268,5 +24634,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "kozioł oporowy"
@@ -24275,10 +24641,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Koleje linowe"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "wyciąg krzesełkowy"
@@ -24286,10 +24652,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Edycja wyciągu krzesełkowego"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "wyciąg orczykowy"
@@ -24297,10 +24663,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Edycja wyciągu orczykowego"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "kolej linowa"
@@ -24308,10 +24674,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Edycja kolei linowej"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24319,10 +24685,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24331,5 +24698,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24337,5 +24704,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24344,5 +24711,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24350,5 +24717,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "stacja benzynowa"
@@ -24358,69 +24725,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Edycja stacji benzynowej"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "ląd"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24437,34 +24826,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24472,37 +24862,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Godziny otwarcia"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24523,33 +24924,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24558,170 +24961,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "Kiosk"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "sklep osiedlowy"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Rodzaje paliwa:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel (olej napędowy)"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Biodiesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Ultimate Diesel (GTL)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel dla ciężarówek"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Benzyna bezołowiowa 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Benzyna bezołowiowa 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Benzyna bezołowiowa 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "Benzyna bezołowiowa 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (bioetanol 10%)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (bioetanol 85%)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "Gaz LPG"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "Gaz CNG (sprężony gaz ziemny)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24729,4 +25154,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24738,6 +25164,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "parking"
@@ -24746,5 +25172,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Edycja parkingu"
@@ -24755,25 +25181,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Numer referencyjny"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "wielopoziomowy"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "terenowy"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "podziemny"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Parkuj i Jedź"
@@ -24782,54 +25210,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Opłata"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Pojemność całkowita"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Miejsca dla niepełnosprawnych"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Miejsca dla kobiet"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Miejsca dla rodziców"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Zobacz Wiki dla znacznika capacity:[rodzaj]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "myjnia samochodowa"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Edycja myjni samochodowej"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "dealer samochodowy"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Edycja warsztatu samochodowego"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "warsztat samochodowy"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Edycja warsztatu samochodowego"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Rodzaj"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Edycja drzewa"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Zawartość"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Numer telefonu"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Numer faksu"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Strona internetowa"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Adres e-mail"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "wypożyczalnia"
@@ -24838,10 +25410,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Edycja wypożyczalni samochodów"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "wypożyczalnia"
@@ -24849,28 +25420,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Edytuj wypożyczalnię samochodów"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Edycja parkingu dla rowerów"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Pojemność"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocykle"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Edycja autostrady"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "miejsce obsługi podróżnych"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Skalę"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "zła"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Szablony"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "odzież"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Edycja parkingu dla rowerów"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Pojemność"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "sklep rowerowy"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Edycja warsztatu rowerowego"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Edycja wypożyczalni rowerów"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24880,5 +25510,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24886,5 +25516,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24892,5 +25522,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "przystanek kolejowy"
@@ -24898,5 +25528,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Edycja przystanku kolejowego"
@@ -24904,5 +25534,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "przystanek tramwajowy"
@@ -24911,5 +25541,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Edycja przystanku tramwajowego"
@@ -24917,5 +25547,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "peron kolejowy"
@@ -24924,5 +25554,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Edycja peronu kolejowego"
@@ -24934,5 +25564,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Oznaczenie (numer toru)"
@@ -24940,10 +25570,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "obszar"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "wejście do metra"
@@ -24952,10 +25582,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Edycja wejścia do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Dla niepełnosprawnych"
@@ -24964,5 +25594,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "dworzec autobusowy"
@@ -24971,5 +25601,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Edycja dworca autobusowego"
@@ -24977,5 +25607,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "przystanek autobusowy"
@@ -24985,13 +25615,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Edycja przystanku autobusowego"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "schronienie"
@@ -24999,19 +25628,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "ławka"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Nawierzchnia dla niewidomych"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "peron autobusowy"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Edycja peronu autobusowego"
@@ -25019,5 +25648,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "postój taksówek"
@@ -25025,5 +25654,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Edycja postoju taksówek"
@@ -25031,10 +25660,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "lotnisko"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25042,5 +25671,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25048,10 +25677,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25060,5 +25689,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "pas startowy"
@@ -25066,5 +25695,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Edycja pasa startowego"
@@ -25072,5 +25701,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "droga kołowania"
@@ -25078,5 +25707,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Edycja drogi kołowania"
@@ -25084,5 +25713,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "lądowisko dla helikopterów"
@@ -25090,5 +25719,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Edycja lądowiska dla helikopterów"
@@ -25098,5 +25727,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25106,5 +25735,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "hangar"
@@ -25115,6 +25744,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -25124,12 +25753,12 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
-msgstr ""
+msgstr "rękaw"
 
 #. item "Airport/Windsock" label "Windsock"
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "terminal"
@@ -25137,5 +25766,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Edycja terminalu"
@@ -25143,15 +25772,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "Edycja bramy terminalu"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Podróż"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -25163,5 +25792,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "hotel"
@@ -25170,5 +25799,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Edycja hotelu"
@@ -25181,8 +25810,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Gwiazdki"
@@ -25206,36 +25835,36 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "Dostęp do internetu"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "bezprzewodowy"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
-msgstr ""
+msgstr "przewodowy"
 
 #. color aeroway
@@ -25247,168 +25876,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
-msgstr "Terminal"
-
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+msgstr "terminal"
+
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
-msgstr ""
+msgstr "Opłata za internet"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "Palenie"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "obiekt dedykowany"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "wydzielona przestrzeń"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
-msgstr ""
-
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Numer telefonu"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
+msgstr "wydzielone pomieszczenie"
 
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "motel"
@@ -25416,20 +25950,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "chata górska"
@@ -25437,10 +25971,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Edycja chaty górskiej"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "hostel"
@@ -25448,30 +25982,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -25479,10 +26014,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -25493,5 +26028,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -25499,5 +26034,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
@@ -25505,5 +26040,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -25511,79 +26048,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "francuska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "kanapki"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
-msgstr ""
+msgstr "Mikrobrowar"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "fast food"
@@ -25591,29 +26128,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "ryba z frytkami"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "kurczak"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
-msgstr ""
+msgstr "przestrzeń restauracyjna"
 
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
-msgstr ""
+msgstr "Edycja przestrzeni restauracyjnej"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -25621,10 +26158,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "pub"
@@ -25632,20 +26174,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "bar"
@@ -25653,10 +26195,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -25664,25 +26206,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "muzeum"
@@ -25690,9 +26232,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "zoo"
@@ -25701,9 +26243,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "park rozrywki"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Edycja parku rozrywki"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "sztuka"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Edycja obiektu sztuki"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -25711,50 +26274,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "park rozrywki"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Edycja parku rozrywki"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "sztuka"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Edycja obiektu sztuki"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Edycja schronienia"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "miejsce na ognisko"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "miejsce na piknik"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Edycja miejsca na piknik"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "informacja turystyczna"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Szczegółowość"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topograficzna"
@@ -25792,5 +26356,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25798,28 +26362,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "schemat"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Obszar"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "miejsce"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "miasto"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Opis"
@@ -25829,5 +26393,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Zaznaczone szlaki:"
@@ -25835,5 +26399,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "turystyka piesza"
@@ -25841,6 +26405,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -25848,5 +26412,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "kolarstwo górskie"
@@ -25854,6 +26418,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -25861,5 +26425,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "jeździectwo"
@@ -25867,46 +26431,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "...możliwe inne rodzaje transportu"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "tablica informacyjna"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Zawartość"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "tablica informacyjna"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "tablica botaniczna"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "drogowskaz"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25915,5 +26479,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "terminal informacyjny"
@@ -25921,55 +26485,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Opis"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "audioprzewodnik"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprzewodnik dostępny przez telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Numer telefonu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "inny punkt informacyjny"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Edycja schronienia"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "miejsce na ognisko"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "miejsce na piknik"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Edycja miejsca na piknik"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "zamek"
@@ -25978,19 +26521,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "wykopalisko archeologiczne"
@@ -25999,9 +26542,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopaliska archeologicznego"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -26009,10 +26552,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "wykopalisko paleontologiczne"
@@ -26020,5 +26563,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Edycja wykopaliska paleontologicznego"
@@ -26026,15 +26569,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "pomnik"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -26042,55 +26585,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "kamień graniczny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Edycja kamienia granicznego"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "plac zabaw"
@@ -26098,35 +26641,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Obiekty sportowe"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -26140,6 +26683,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -26555,6 +27098,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26589,240 +27132,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "futbol australijski"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "krykiet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "sport rakietowy"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "boisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Edycja minigolfa"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Edycja różnych sportów"
@@ -26839,5 +27382,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26864,23 +27406,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "rodzaj"
@@ -26897,5 +27447,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26922,211 +27471,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "ścieżka"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "kręgle"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Edycja wyścigów konnych"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Edycja gimnastyki"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "sporty motorowe"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Edycja sportów motorowych"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Edycja łyżwiarstwa"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Edycja jazdy na deskorolce"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Edytuj pływanie"
@@ -27134,52 +27686,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -27187,204 +27739,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "bule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "sporty motorowe"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Edycja sportów motorowych"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Uwaga"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Edycja parkingu"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Samochody osobowe"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Edycja sportów motorowych"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Edycja łyżwiarstwa"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Edycja przejścia granicznego"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Samochód"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Edycja kolei linowej"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Budowle"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "budynek"
@@ -27392,5 +28010,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -27398,10 +28016,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "ratusz"
@@ -27409,10 +28027,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "ambasada"
@@ -27420,10 +28038,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "sąd"
@@ -27432,10 +28050,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "więzienie"
@@ -27444,10 +28062,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "posterunek policji"
@@ -27457,10 +28075,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -27469,10 +28087,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Edycja straży pożarnej"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "poczta"
@@ -27480,5 +28098,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -27486,15 +28104,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "szkoła"
@@ -27502,10 +28120,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "uniwersytet"
@@ -27513,10 +28131,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "college"
@@ -27524,5 +28142,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -27530,5 +28148,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "kino"
@@ -27537,10 +28155,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "biblioteka"
@@ -27549,9 +28167,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -27559,10 +28177,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "teatr"
@@ -27571,10 +28189,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -27584,5 +28202,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -27591,6 +28209,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religia"
@@ -27599,66 +28217,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -27667,189 +28285,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnici"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresy"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Edycja informacji o adresach"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Numer domu"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nazwa domu"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nazwa ulicy"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Nazwa miejscowości"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Kod pocztowy"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Kod kraju"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Edycja interpolacji adresów"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Sposób numeracji domów"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "nieparzyste"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "parzyste"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabetycznie"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "wieża"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Typ wieży"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "komunikacyjna"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "obserwacyjna"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Wysokość (metry)"
@@ -27857,25 +28405,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -27883,10 +28431,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "wiatrak"
@@ -27894,10 +28442,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -27906,41 +28454,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gazowy"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "ciepłowniczy"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "naftowy"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "ściekowy"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "różne substancje"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Położenie"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "podwodny"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "nadziemy"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -27950,10 +28498,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "dźwig"
@@ -27961,5 +28509,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
@@ -27967,10 +28515,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -27978,10 +28526,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "monitoring"
@@ -27989,23 +28537,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "wewnętrzny"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "zewnętrzny"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "publiczny"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "elektrownia"
@@ -28015,35 +28563,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Edycja elektowni"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "rozdzielnia elektryczna"
@@ -28052,10 +28600,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Edycja rozdzielni elektrycznej"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "stacja transformatorowa"
@@ -28064,5 +28612,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Edycja stacji transformatorowej"
@@ -28070,10 +28618,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -28084,23 +28632,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Edycja słupa elektrycznego"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "wieża"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "słup"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Numer referencyjny"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -28109,20 +28657,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Rodzaj linii"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28130,55 +28678,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Liczba kabli"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Liczba przewodów w jednym kablu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "pojedynczy"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "podwójny"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "potrójny"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "poczwórny"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Udogodnienia"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "toalety"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limitowane"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "telefon"
@@ -28187,5 +28735,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -28193,5 +28741,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "na monety"
@@ -28199,5 +28747,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "na banknoty"
@@ -28205,5 +28753,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -28211,5 +28759,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -28217,15 +28765,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -28234,5 +28782,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -28240,35 +28788,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "puszki"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "odzież"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "kosz na śmieci"
@@ -28276,5 +28819,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Edycja kosza na śmieci"
@@ -28283,31 +28826,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Oparcie"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiał"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "kamień"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Kolor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "czarny"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "brązowy"
@@ -28386,5 +28929,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28394,31 +28937,31 @@
 msgstr "zielony"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "czerwony"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "niebieski"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "szary"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "biały"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Pojemność"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -28426,31 +28969,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "niska"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "połowiczna"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "pełna"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "fontanna"
@@ -28459,10 +29002,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -28471,10 +29014,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "hydrant"
@@ -28483,5 +29026,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Edycja hydrantu"
@@ -28489,501 +29032,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Ruch pieszy"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Edycja supermarketu"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "sklep osiedlowy"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Edycja sklepu osiedlowego"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Edycja kiosku"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "rzeźnik"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Edycja sklepu mięsnego"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "piekarnia"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Edycja piekarni"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "naturalna żywność"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Edycja sklepu z naturalną żywnością"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "sklep monopolowy"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Edycja sklepu monopolowego"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "sklep z napojami"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Edycja sklepu z napojami"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Sklepy"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "drogeria"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Edycja drogerii"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "fryzjer"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Edycja salonu fryzjerskiego"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "optyk"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Edycja optyka"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Edycja sklepu komputerowego"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "obuwniczy"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Edycja sklepu obuwniczego"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "sklep turystyczny"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Edycja sklepu ze sprzętem turystycznym"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Edycja sklepu sportowego"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "pralnia chemiczna"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Edycja palni chemicznej"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "pralnia samoobsługowa"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "wyspa"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Tamoil"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Edycja toru"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "sklep komputerowy"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Edycja sklepu komputerowego"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "sklep elektroniczny"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Edycja sklepu elektronicznego"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "sprzęt hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Edycja sklepu ze sprzętem hi-fi"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "wypożyczalnia wideo"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Edycja wypożyczalni wideo"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "kwiaciarnia"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Edycja kwiaciarni"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "centrum ogrodnicze"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Edycja centrum ogrodniczego"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "sklep z narzędziami"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Edycja sklepu z narzędziami"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "sklep DIY"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Edycja sklepu DIY (zrób to sam)"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "meble"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Edycja sklepu meblowego"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "artykuły biurowe"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Edycja sklepu z artykułami biurowymi"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "księgarnia"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Edycja księgarni"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "biuro podróży"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Edycja biura podróży"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "zabawki"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Edycja sklepu z zabawkami"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "automat sprzedający"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Edycja automatu sprzedającego"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Sprzedawane produkty"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "bilety komunikacji miejskiej"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "mapy komunikacji miejskiej"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "bilety parkingowe"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "jedzenie"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "napoje"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "słodycze"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "papierosy"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "zdjęcia"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "jedzenie dla zwierząt"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "gazety"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "zabawki"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "znaczki"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "karty SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "vouchery"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "prezerwatywy"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampony"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "torby na odchody"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Gotówka"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "bank"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Edycja banku"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "bankomat"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "kantor"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Edycja kantoru"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Edycja bankomatu"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Zdrowie"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "lekarz"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Edycja lekarza"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "dentysta"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Edycja dentysty"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "apteka"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Edycja apteki"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "realizacja recept"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "szpital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Edycja szpitala"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "okno życia"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Edycja okna życia"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Sklepy"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "dealer samochodowy"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Edycja warsztatu samochodowego"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "sklep rowerowy"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Edycja warsztatu rowerowego"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Edycja supermarketu"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "drogeria"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Edycja drogerii"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "sklep osiedlowy"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Edycja sklepu osiedlowego"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Edycja kiosku"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "księgarnia"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Edycja księgarni"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "biuro podróży"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Edycja biura podróży"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "rzeźnik"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Edycja sklepu mięsnego"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "piekarnia"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Edycja piekarni"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "kwiaciarnia"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Edycja kwiaciarni"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "naturalna żywność"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Edycja sklepu z naturalną żywnością"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "sklep monopolowy"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Edycja sklepu monopolowego"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "sklep z napojami"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Edycja sklepu z napojami"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "sklep komputerowy"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Edycja sklepu komputerowego"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "sklep elektroniczny"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Edycja sklepu elektronicznego"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "sprzęt hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Edycja sklepu ze sprzętem hi-fi"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "meble"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Edycja sklepu meblowego"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "centrum ogrodnicze"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Edycja centrum ogrodniczego"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "sklep z narzędziami"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Edycja sklepu z narzędziami"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "sklep DIY"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Edycja sklepu DIY (zrób to sam)"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "artykuły biurowe"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Edycja sklepu z artykułami biurowymi"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "fryzjer"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Edycja salonu fryzjerskiego"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "obuwniczy"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Edycja sklepu obuwniczego"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "zabawki"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Edycja sklepu z zabawkami"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "wypożyczalnia wideo"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Edycja wypożyczalni wideo"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "pralnia chemiczna"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Edycja palni chemicznej"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "pralnia samoobsługowa"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "wyspa"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "sklep turystyczny"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Edycja sklepu ze sprzętem turystycznym"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Edycja sklepu sportowego"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "optyk"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Edycja optyka"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "automat sprzedający"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Edycja automatu sprzedającego"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Sprzedawane produkty"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "bilety komunikacji miejskiej"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "mapy komunikacji miejskiej"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "bilety parkingowe"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "jedzenie"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "napoje"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "słodycze"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "papierosy"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "zdjęcia"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "jedzenie dla zwierząt"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "gazety"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "zabawki"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "znaczki"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "karty SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "vouchery"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "prezerwatywy"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampony"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "torby na odchody"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Gotówka"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "bank"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Edycja banku"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "bankomat"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "kantor"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Edycja kantoru"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Edycja bankomatu"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Zdrowie"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "lekarz"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Edycja lekarza"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "dentysta"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Edycja dentysty"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "apteka"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Edycja apteki"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "realizacja recept"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "szpital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Edycja szpitala"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -28992,5 +29537,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28999,15 +29544,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -29015,5 +29560,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -29022,368 +29567,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Granice"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "narodowa"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Edycja granicy narodowej"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "administracyjna"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Edycja granicy administracyjnej"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "cywilna"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Edycja granicy cywilnej"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "polityczna"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Edycja granicy politycznej"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "park narodowy"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Edycja granicy parku narodowego"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Miejsca"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "kontynent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "kraj"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "stan"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Edycja stanu"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "okręg"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "miasto"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Edycja miasta"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "małe miasto"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "dzielnica"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "wieś"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "przysiółek"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "okolica"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "wzgórze"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Edycja wzgórza"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "lodowiec"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Edycja lodowca"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "wulkan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Edycja wulkanu"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "wejście do jaskini"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Edycja wejścia do jaskini"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "wyspa"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "wysepka"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Edycja wysepki"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "tablica przyrodnicza"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "drzewo"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Edycja drzewa"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Nazwa systematyczna"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "las pierwotny"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Edycja lasu pierwotnego"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "iglasty"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "liściasty"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "mieszany"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "las"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Edycja lasu"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "rezerwat przyrody"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Edycja rezerwatu przyrody"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "wejście do jaskini"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Edycja wejścia do jaskini"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "wzgórze"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Edycja wzgórza"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "lodowiec"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Edycja lodowca"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "wulkan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Edycja wulkanu"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Granice"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "narodowa"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Edycja granicy narodowej"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "administracyjna"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Edycja granicy administracyjnej"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "cywilna"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Edycja granicy cywilnej"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "polityczna"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Edycja granicy politycznej"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "park narodowy"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Edycja granicy parku narodowego"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "rumowisko"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Edycja rumowiska"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "hala górska"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Edycji hali górskiej"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "busz"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Edycja buszu"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "wrzosowisko"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Edycja wrzosowiska"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "drzewo"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Edycja drzewa"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Nazwa systematyczna"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "las pierwotny"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Edycja lasu pierwotnego"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "iglasty"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "liściasty"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "mieszany"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "las"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Edycja lasu"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "rezerwat przyrody"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Edycja rezerwatu przyrody"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "rumowisko"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Edycja rumowiska"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "busz"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Edycja buszu"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "hala górska"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Edycji hali górskiej"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "wrzosowisko"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Edycja wrzosowiska"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "zagroda"
@@ -29392,45 +29943,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "łąka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -29438,25 +29989,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "ogród"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "trawa"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "zieleń miejska"
@@ -29464,10 +30015,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Edycja zieleni miejskiej"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -29475,20 +30026,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "teren rekreacyjny"
@@ -29496,5 +30047,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -29502,15 +30053,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -29518,9 +30069,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -29528,39 +30079,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "handel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Teren kolejowy"
@@ -29568,15 +30119,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Obszar wojskowy"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -29584,52 +30135,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Budowa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "teren poprzemysłowy"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Edycja terenu poprzemysłowego"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Teren pod zabudowę"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Wysypisko"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "stacja"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresy"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Edycja informacji o adresach"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Numer domu"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nazwa domu"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nazwa ulicy"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Nazwa miejscowości"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Kod pocztowy"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Kod kraju"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "U"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "E"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "Z"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Edycja interpolacji adresów"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Sposób numeracji domów"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "nieparzyste"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "parzyste"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabetycznie"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Zawartość"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Dodaj informacje o autorze"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Obraz"
 
 #. item "Relations/Multipolygon"
@@ -29637,5 +30321,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Edycja multipolygonu"
@@ -29647,5 +30331,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "Zewnętrzny segment"
@@ -29653,5 +30337,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "Wewnętrzny segment"
@@ -29659,5 +30343,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "granica"
@@ -29668,5 +30352,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Edycja granicy"
@@ -29674,36 +30358,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Rodzaj granicy"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "administracyjna"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "narodowa"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "cywilna"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "polityczna"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Poziom administracyjny"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Podobszary"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Centrum administracyjne"
@@ -29711,5 +30395,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -29718,5 +30402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -29724,34 +30408,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "zakaz skrętu w lewo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "zakaz skrętu w prawo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -29760,15 +30444,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "do drogi"
@@ -29776,5 +30460,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "trasa"
@@ -29783,5 +30467,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -29789,132 +30473,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Typ trasy"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr ""
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29982,5 +30555,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29990,9 +30563,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "objazd"
@@ -30006,10 +30579,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -30017,31 +30590,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -30050,30 +30623,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34051,7 +34624,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34173,8 +34745,14 @@
 msgstr "Sycylia - Włochy"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Pozostawiaj kopie zapasowe plików"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Punkty drogi wodnej"
 
 #~ msgid "Move"
@@ -34234,7 +34812,4 @@
 #~ msgstr[1] "obrazy"
 #~ msgstr[2] "obrazów"
-
-#~ msgid "Image"
-#~ msgstr "Obraz"
 
 #~ msgid "name"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 22859)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-17 17:53+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 01:01+0000\n"
 "Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\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-08-20 19:15+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Aviso"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -256,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -281,5 +281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -304,5 +304,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -413,4 +413,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1062,5 +1063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1073,5 +1074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1482,13 +1483,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1497,5 +1498,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1503,9 +1504,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1513,5 +1514,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1545,8 +1546,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1555,9 +1556,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1573,6 +1574,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1582,5 +1583,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1605,6 +1606,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Erro"
@@ -1766,5 +1767,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Não, abortar"
@@ -2053,5 +2054,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2540,5 +2541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2582,9 +2583,9 @@
 "Quer realmente move-los?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Solte o botão do mouse para selecionar os objetos no retângulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2593,9 +2594,9 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Solte o botão do mouse para parar de girar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2878,5 +2879,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Buscar"
@@ -3088,7 +3089,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3360,5 +3361,5 @@
 msgstr[1] "Mover {0} nós"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3516,6 +3517,6 @@
 msgstr "Correção automática de tags"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
@@ -3524,10 +3525,10 @@
 "desabilitado"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "Não foi possível criar o arquivo {0}, outro nome de arquivo será usado"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
@@ -3536,15 +3537,15 @@
 "ignorado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "Não foi possível remover o arquivo de segurança antigo {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "Erro ao criar o backup da camada removida: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3563,15 +3564,15 @@
 msgstr "Valor de longitude ilegal \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Aviso: falha ao persistir preferências para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Erro no arquivo de configuração nas linhas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3582,5 +3583,5 @@
 "\"{0}\" não é uma directória."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3591,5 +3592,5 @@
 "preferência \"{0}\" não é uma directória.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3600,5 +3601,5 @@
 "falta da directória da preferência: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3609,5 +3610,5 @@
 "devido a falta da directória da preferência: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3617,5 +3618,5 @@
 "preferências base."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3626,5 +3627,5 @@
 "ficheiro de preferência base."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3635,5 +3636,5 @@
 "de preferências base: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3645,5 +3646,5 @@
 "preferências base.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3654,10 +3655,10 @@
 "preferências para original: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Erro: Linha ''{0}'' inesperada em arquivo de bookmarks ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3786,5 +3787,5 @@
 "incluída"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3862,9 +3863,9 @@
 "do changesetId é {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Uma primitiva com ID = 0 não pode ser invisível."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3874,5 +3875,5 @@
 "outra não"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4070,15 +4071,34 @@
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grade Suíça"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Zona UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Norte"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "sul"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Ir ali"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4102,9 +4122,9 @@
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "UTM França (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "Sistema Geodésico UTM"
@@ -4148,5 +4168,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "ferrovia"
@@ -4167,5 +4187,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4421,29 +4441,29 @@
 msgstr "Senha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opções"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Mostar essa ajuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Argumento padrão de geometria unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Baixar o retângulo limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4451,41 +4471,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Baixar o retângulo limite como dados de gps brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z) como dados raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Selecionar dentro da busca"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Executar em modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Resetar preferência para default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Definir o idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "opções providas como propriedades do sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/TRILHA/PARA/PASTA/DO/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Alterar o diretório para todas as configurações de usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4499,9 +4519,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4511,59 +4531,69 @@
 "ordem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Tenha certeza de que irá carregar algum dado, caso use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Atualizando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Instalando plugins atualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Carregando plugins anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Aplicando padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Criando tela principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Carregando plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Dado osm não salvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Restaurar"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "Cartões de Débito"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM encontrado {0} camadas de dados osm não salvos. Possivelmente o JOSM "
 "caiu na última vez. Você quer restaurar os dados?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Configuração {0} das preferências foi removida pois não é mais usada."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4576,9 +4606,9 @@
 "anterior (compatível com Java 5) do JOSM.</li></ul>Mais informação:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "Sair do JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Continuar, tentar assim mesmo"
@@ -4592,9 +4622,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4718,23 +4749,23 @@
 msgstr "Usuário:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "camada não está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Camada ''{0}'' precisa estar na lista de camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Imperial"
@@ -4833,5 +4864,5 @@
 msgstr "Clique para fechar o diálogo e cancelar a remoção dos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4841,17 +4872,17 @@
 "um determinado nível de zoom.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Nível de zoom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "do tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "até o tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4865,25 +4896,25 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Endereço do tile:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Aplicar o endereço do tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Por gentileza digite o endereço do tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "O valor atual não é um endereço de tile válido"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Por favor digite o índice do tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "O valor atual não é um índice de tile válido para este nível de zoom"
@@ -5311,4 +5342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5393,4 +5425,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5407,4 +5440,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5478,5 +5512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5488,10 +5522,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "nenhum"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "todos os números"
@@ -5574,5 +5608,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5584,5 +5618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5617,17 +5651,17 @@
 msgstr "Não decidido ainda"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Regra:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Escreva uma regra para todos os membros da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Etiquetar relações modificadas com "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5637,16 +5671,16 @@
 "aplicada<br>a todas as relações modificadas.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Chave:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+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>"
+
+#. Strings in GTK ColorChooser
 #: ../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>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5654,5 +5688,5 @@
 msgstr "Valor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5661,5 +5695,5 @@
 "strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5677,5 +5711,5 @@
 "tomar o lugar do caminho original na relação.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5693,5 +5727,5 @@
 "original na relação.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Aplicar regra para todos os membros"
@@ -5847,5 +5881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5966,5 +6000,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5972,5 +6006,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5978,5 +6012,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5984,5 +6018,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5990,5 +6024,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5997,5 +6031,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6003,5 +6037,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6009,5 +6043,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6015,24 +6049,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro ativo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos escondidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos desabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Feche a janela de filtros para ver todos objetos.<p></html>"
@@ -6053,5 +6087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6076,37 +6110,37 @@
 msgstr "Informação avançada de objeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Digite as coordenadas do novo nó."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Usar casas decimais."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos são para coordenadas dos hemisférios Sul/Oeste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Por favor digite uma latitude válida entre -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Por favor digite uma latitude entre -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Por favor digite uma longitude válida entre -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Por favor digite uma longitude entre -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Feche a janela de diálogo e crie um novo nó"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Feche a janela de diálogo, não crie um novo nó"
@@ -6162,9 +6196,9 @@
 msgstr "Informação sobre camada"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relações"
@@ -6212,10 +6246,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Baixar membros incompletos das relações selecionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Baixar membros incompletos"
@@ -6235,37 +6269,37 @@
 msgstr "Abrir uma janela de seleção."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Procure por objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zoom para seleção."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zoom para elementos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Chamar editor para relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Chamar editor para relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Selecionar na lista de relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Selecionar uma relação na lista de relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6274,27 +6308,27 @@
 msgstr "Seleção"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Caminhos:{1} / Nós:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Seleção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Obter informação detalhada do estado interno dos objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Inspecionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Desacoplar painel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6302,5 +6336,5 @@
 "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Clique para minimizar/maximizar o conteúdo do painel"
@@ -6593,13 +6627,13 @@
 msgstr "Nada para aproximar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "O conteúdo deste changeset ainda não foi baixado."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Baixar agora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Baixar o conteúdo do changeset"
@@ -6711,4 +6745,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6727,6 +6765,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6744,8 +6780,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6756,4 +6799,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6768,33 +6817,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6818,12 +6856,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6895,10 +6943,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6928,8 +6980,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6992,6 +7040,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7044,4 +7090,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7106,32 +7164,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7140,6 +7206,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7148,24 +7216,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7180,82 +7238,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7336,155 +7394,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nome"
@@ -7968,4 +8031,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<diferente>"
@@ -8502,17 +8566,17 @@
 msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "incluir relações de parentesco diretas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Carregar relações de parentesco"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Carregar relações-pai"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Editar relação selecionada atualmente"
@@ -8803,4 +8867,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8808,15 +8873,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Tipo"
@@ -8835,16 +8900,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "Desconhecido"
@@ -9476,5 +9541,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Lança diálogo para escolha de arquivo"
@@ -9723,20 +9788,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Layer"
@@ -10240,5 +10305,63 @@
 msgstr[1] "{0} objetos a acrescentar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrição: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} trilha"
+msgstr[1] "{0} trilhas"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Descrição"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "Vigência"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "Comprimento"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Comprimento: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rota, "
+msgstr[1] "{0} rotas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} ponto da via"
+msgstr[1] "{0} pontos da via"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -10246,62 +10369,17 @@
 msgstr "ponto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrição: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} trilha"
 msgstr[1] "{0} trilhas"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Descrição"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "Vigência"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "Comprimento"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Comprimento: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rota, "
-msgstr[1] "{0} rotas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} ponto da via"
-msgstr[1] "{0} pontos da via"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10311,10 +10389,10 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10325,7 +10403,7 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10333,10 +10411,10 @@
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10344,10 +10422,10 @@
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10355,21 +10433,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Baixar próximo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "somente trilha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "somente pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10381,9 +10459,9 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10393,5 +10471,5 @@
 "posterior ao final, foram omitidos ou movidos para o começo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10400,30 +10478,30 @@
 "Alguns pontos de interesse que ficaram muito longe da trilha foram omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Usar preferências globais."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Desenhar linhas entre pontos para esta camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Não desenhar linhas entre pontos para esta camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Selecionar opções de linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10431,5 +10509,5 @@
 msgstr "Personalizar cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10438,5 +10516,5 @@
 msgstr "Padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10445,18 +10523,18 @@
 msgstr "Selecionar uma cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Marcadores de Pontos Nomeados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Trackpoints nomeados de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importar Áudio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10469,23 +10547,23 @@
 "correlacionar os pontos com os dados de audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Importação não possível"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Árquivos de Áudio WAV (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importar imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10944,15 +11022,15 @@
 msgstr "O arquivo de imagem não pode ser removido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Nenhuma imagem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Carregando {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11970,4 +12048,48 @@
 msgid "Voice recorder calibration"
 msgstr "Calibração do gravador de voz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Intervalo de atualização (em dias):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Valor padrão é \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Backup de arquivo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Configure se criar arquivos de segurança"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12051,5 +12173,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Carro"
@@ -12068,16 +12190,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -12111,12 +12233,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "A Pé"
@@ -12377,18 +12499,18 @@
 msgstr "Padrão (autodeterminado)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Habilitar padrões embutidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Habilitar padrões de ícones embutidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Estido em uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Estilo de pintura do mapa"
@@ -12709,27 +12831,19 @@
 msgstr "A projeção {0} nâo pode ser ativada. Usando Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Configurações de Proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Backup de arquivo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Configure se usar um servidor de proxy"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Configure se criar arquivos de segurança"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -12847,6 +12961,15 @@
 "<br><br>Detalhes (não traduzido):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "alternativa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13076,12 +13199,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Manter arquivos de backup"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13279,5 +13394,5 @@
 msgstr "Adicionar nova tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13286,49 +13401,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mais informações sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "elementos"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Atributos opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconhecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13338,15 +13453,15 @@
 msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analisando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13356,17 +13471,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nada selecionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Seleção inadequada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Aplicar Preferência"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13982,5 +14097,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14086,5 +14201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14093,5 +14208,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14160,5 +14275,5 @@
 msgstr "Arquivo \"{0}\" não existe."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14168,10 +14283,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14179,5 +14294,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14185,5 +14300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14191,10 +14306,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14202,5 +14317,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14208,5 +14323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14214,5 +14329,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14221,10 +14336,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificação de <member> incompleta com ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14232,9 +14347,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14242,11 +14357,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Objeto ilegal com id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14258,8 +14373,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14273,5 +14388,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14279,5 +14394,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14286,6 +14401,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14297,6 +14412,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14305,5 +14420,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14311,5 +14426,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14317,12 +14432,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14330,5 +14445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14338,5 +14453,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14346,5 +14461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14352,17 +14467,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Preparando dados OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Analisando dados do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Preparando grupo de dados..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14868,11 +14983,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Baixando lista de plugins a partir de \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14881,16 +14996,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14901,5 +15016,5 @@
 "este site. A exceção foi: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14920,13 +15035,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Não fazer nada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Relatar um Erro"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14938,9 +15053,9 @@
 "favor, seja gentil e redija um relatório de erro."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Exceção Inesperada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14948,5 +15063,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14954,5 +15069,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14961,5 +15076,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14967,9 +15082,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(O texto já foi copiado para a Área de Transferência)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Você encontrou um bug no JOSM"
@@ -15172,5 +15287,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15225,5 +15340,5 @@
 msgstr "não usado"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15236,5 +15351,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15244,5 +15359,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15253,5 +15368,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Dica: Você pode editar atalhos em preferências.)"
@@ -15363,5 +15478,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Visibilidade"
@@ -15447,10 +15562,62 @@
 msgstr "Enviar trilhas para openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Horário de Funcionamento"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Modificar propriedades de até {0} objeto"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Escolher"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Caminho {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Ferramenta: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Erro no filtro"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "aberto"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -15622,51 +15789,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Não é possível adicionar nó fora do planeta."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parâmetro \"{0}\" não pode ser nulo"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parâmetro \"{0}\" não pode ser nulo"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15765,16 +15934,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15788,5 +15949,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15899,5 +16060,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Construções"
@@ -16136,5 +16297,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16555,8 +16716,4 @@
 msgstr "Leste"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Norte"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16672,6 +16829,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Camada vazia"
@@ -18023,5 +18180,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Transporte Público"
@@ -18065,36 +18222,41 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Pontos da via"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "ler dados da API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "ler dados da API"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "criar novos objetos"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "mudar a seleção"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "mudar a exibição"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "confirmar todas as ações do Controle Remoto manualmente"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
@@ -18102,13 +18264,13 @@
 "programas."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Controle Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Configurações do plugin de Controle Remoto."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18120,34 +18282,34 @@
 "aplicação externa."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Ações permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Você quer permitir isto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalhes do pedido: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18370,58 +18532,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "imagem "
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -18707,11 +18869,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Editar Cano"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19825,5 +19986,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -19945,59 +20106,59 @@
 msgstr "Vias Sobrepostas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20477,143 +20638,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "acima"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Por favor digite o índice do tile"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Aplicar o filtro"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20633,7 +20791,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "múltiplo"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20727,12 +20884,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Selecionar dentro da busca"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Pontos da via"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20749,9 +20904,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Uma exceção ocorreu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20810,21 +20965,21 @@
 msgstr "Ajustar a posição da camada WMS selecionada"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Por favor selecionea camada WMS para ajustar."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Selecionar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Atualmente não há nenhuma camada WMS para ajustar."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20835,5 +20990,5 @@
 msgstr "Baixar imagens WMS do {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20842,5 +20997,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20848,10 +21003,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20860,24 +21015,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20888,75 +21043,100 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Sim, buscar imagens"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "URL inválido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Baixar imagens visíveis"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Mudar resolução"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Recarregar imagens erradas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Salvar camada WMS para arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Salvar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Carregar camada WMS de um arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Carregar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Erro no formato do arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Adicionar marcador para esta camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Download automático"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Não dá pra escrever mtime."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir uma camada WMS em branco para carregar dados de um arquivo"
@@ -21526,16 +21706,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Mostrar imagens de fundo do OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importar problemas do OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21543,5 +21728,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21549,5 +21734,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21558,5 +21743,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21567,10 +21752,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "O grande pacote de itens de aparência JGoodies Plastic."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21578,15 +21763,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Permite que outros aplicativos enviem comandos para o JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21596,5 +21781,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21603,10 +21788,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Possibilita capacidade de roteamento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21615,5 +21800,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21622,15 +21807,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21640,15 +21825,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21657,5 +21842,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21664,5 +21849,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21673,10 +21858,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21685,5 +21870,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21693,5 +21878,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21700,20 +21885,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21722,5 +21907,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21764,4 +21949,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21794,10 +21980,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Estradas"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Ruas"
@@ -21808,5 +21994,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Auto-estrada"
@@ -21815,5 +22001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Editar Auto-estrada"
@@ -21850,10 +22036,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referência"
@@ -21867,8 +22053,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Faixas"
@@ -21887,13 +22073,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Velocidade máxima (km/h)"
@@ -21927,17 +22113,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Mão Única"
@@ -21974,17 +22160,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22018,17 +22204,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Túnel"
@@ -22059,17 +22245,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Corte"
@@ -22100,17 +22286,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr ""
@@ -22118,5 +22304,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr ""
@@ -22125,5 +22311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr ""
@@ -22131,5 +22317,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr ""
@@ -22138,5 +22324,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr ""
@@ -22146,6 +22332,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -22153,5 +22339,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr ""
@@ -22160,5 +22346,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr ""
@@ -22171,5 +22357,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primária"
@@ -22178,5 +22364,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Editar estrada primária"
@@ -22184,10 +22370,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr ""
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -22199,5 +22385,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -22207,5 +22393,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr ""
@@ -22213,5 +22399,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr ""
@@ -22221,5 +22407,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -22231,5 +22417,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -22239,5 +22425,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -22247,6 +22433,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -22269,15 +22455,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Largura (metros)"
@@ -22289,5 +22475,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residencial"
@@ -22296,5 +22482,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Editar Rua Residencial"
@@ -22314,12 +22500,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Superfície"
@@ -22341,166 +22527,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "não pavimentada"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "concreto"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "madeira"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "pedras"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "grama"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "areia"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "terra"
@@ -22508,5 +22694,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -22515,5 +22701,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -22521,5 +22707,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr ""
@@ -22528,5 +22714,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Editar Calçadão"
@@ -22534,5 +22720,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Serviço"
@@ -22541,5 +22727,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Editar Rua de Serviço"
@@ -22549,18 +22735,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Tipo de Rua de Serviço"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -22568,5 +22754,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -22576,10 +22762,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -22588,5 +22774,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -22594,14 +22780,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Construção"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Editar Rodovia em Construção"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Junção"
@@ -22617,5 +22803,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rotatória"
@@ -22624,5 +22810,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr ""
@@ -22631,15 +22817,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Pedágio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Sem saída"
@@ -22647,5 +22833,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Acesso"
@@ -22671,4 +22857,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22676,4 +22863,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22749,236 +22942,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privado"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permitido"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "não"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privado"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permitido"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "não"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Carga"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Veículos de Carga Pesada"
@@ -22993,10 +23193,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Cavalo"
@@ -23012,10 +23212,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -23030,19 +23231,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Automóvel"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Veículos de Serviço Público"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -23050,20 +23251,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (toneladas)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Altura máxima (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Largura máx. (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Comprimento Máx. (metros)"
@@ -23071,5 +23272,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rotatória"
@@ -23080,5 +23281,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Editar Junção"
@@ -23098,10 +23299,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -23123,10 +23324,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -23148,10 +23349,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primária"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -23173,5 +23374,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23186,9 +23387,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr ""
@@ -23202,9 +23403,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr ""
@@ -23248,10 +23449,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "serviço"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -23281,5 +23482,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23291,10 +23492,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Editar Ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Editar Túnel"
@@ -23302,10 +23503,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Vias"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Trilha"
@@ -23314,35 +23515,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Editar Trilha"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -23350,5 +23551,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Caminho"
@@ -23357,76 +23558,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Edicar Caminho"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "caminhada"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr ""
@@ -23435,5 +23636,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -23441,5 +23642,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -23447,5 +23648,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -23463,11 +23664,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Editar Ciclovia"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -23475,5 +23676,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -23481,5 +23682,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -23487,5 +23688,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -23494,5 +23695,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Editar Calçada"
@@ -23500,5 +23701,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Escada"
@@ -23508,10 +23709,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Editar Escadaria"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Número de Assentos"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Trevo de Acesso"
@@ -23519,15 +23726,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Editar Trevo de Acesso"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Serviços"
@@ -23535,5 +23742,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -23541,10 +23748,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23573,36 +23781,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operador"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Restaurar"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Editar Restaurante"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Telefone de Emergência"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Sinal de Trânsito"
@@ -23612,5 +23841,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruzamento de pedestres"
@@ -23619,27 +23848,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "faixa de pedestre (sem sinal)"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "sinal de trânsito"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "ilha"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "sem faixa"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Travessia à cavalo"
@@ -23647,6 +23876,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Travessia de bicicleta"
@@ -23655,11 +23884,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Guarda de trânsito"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -23667,30 +23896,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelicano"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "tucano"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "papagaio"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pégasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Pare"
@@ -23698,67 +23927,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Faixa de Pedestres"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Editar Faixa de Pedestres"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Mini-rotatória"
@@ -23769,14 +23936,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Direção"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "sentido horário"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Faixa de Pedestres"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Editar Faixa de Pedestres"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Retorno"
@@ -23786,5 +24015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Limite da Cidade"
@@ -23792,15 +24021,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Editar Placa de Limite da Cidade"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Radar de Velocidade"
@@ -23809,11 +24038,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Telefone de Emergência"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Aclive"
@@ -23821,5 +24045,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Aclive Íngreme"
@@ -23827,5 +24051,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23835,10 +24059,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Travessia de Rio"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Editar Travessia de Rio"
@@ -23846,5 +24070,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Desfiladeiro"
@@ -23852,5 +24076,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Editar Desfiladeiro"
@@ -23859,10 +24083,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Altitude"
@@ -23870,5 +24094,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Barreiras"
@@ -23876,5 +24100,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -23882,5 +24106,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23925,16 +24149,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23943,5 +24167,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23949,5 +24173,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23955,10 +24179,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23966,15 +24190,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr ""
@@ -23982,5 +24206,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr ""
@@ -23988,10 +24212,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr ""
@@ -24000,5 +24224,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr ""
@@ -24009,22 +24233,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr ""
@@ -24032,5 +24256,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr ""
@@ -24039,5 +24263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -24048,10 +24272,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Editar Entrada"
@@ -24059,5 +24283,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr ""
@@ -24065,50 +24289,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -24116,25 +24340,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -24142,25 +24366,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Água"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr ""
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr ""
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr ""
@@ -24168,10 +24381,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -24179,10 +24392,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr ""
@@ -24190,10 +24403,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr ""
@@ -24201,10 +24414,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr ""
@@ -24214,59 +24427,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
+msgstr ""
+
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr ""
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr ""
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Queda d'água"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Editar Queda-d'água"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Açude"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Editar Açude"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr ""
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr ""
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Editar Água"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr ""
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr ""
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Linha Costeira"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Editar Linha Costeira"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr ""
@@ -24275,10 +24542,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr ""
@@ -24289,14 +24557,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -24310,35 +24578,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr ""
@@ -24346,20 +24614,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr ""
@@ -24367,145 +24635,215 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Linha Costeira"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Editar Linha Costeira"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Compras"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Terminal de Barca"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Editar Terminal de Barca"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Carro"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicicleta"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Rota de Barca"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Editar rota de barca"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr ""
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr ""
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr ""
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Ponto de Hidrovia"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "marina"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Editar Marina"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Embarcadouro"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Editar embarcadouro"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Portão de Dique"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Açude"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Editar Açude"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Queda d'água"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Editar Queda-d'água"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Ponto de Virada"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Editar Marina"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Embarcadouro"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Editar embarcadouro"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Terminal de Barca"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Editar Terminal de Barca"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Rampa de barco"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24515,16 +24853,38 @@
 msgstr "Editar Rampa de barco"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr ""
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr ""
@@ -24532,5 +24892,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr ""
@@ -24560,7 +24920,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -24576,8 +24936,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -24591,29 +24951,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elitrificado"
@@ -24626,8 +24986,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24698,8 +25058,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24711,8 +25071,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltagem"
@@ -24725,8 +25085,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Frequencia (Hz)"
@@ -24739,23 +25099,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Mono-trilho"
@@ -24763,50 +25123,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Editar Mono-trilho"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metrô"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Editar Metrô"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Bonde/VLT"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Editar Bonde/VLT"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -24814,5 +25174,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -24821,10 +25181,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr ""
@@ -24833,9 +25193,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr ""
@@ -24844,5 +25204,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -24851,5 +25211,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -24859,5 +25219,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -24865,5 +25225,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr ""
@@ -24872,5 +25232,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24879,10 +25239,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr ""
@@ -24890,10 +25250,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24901,10 +25261,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr ""
@@ -24912,10 +25272,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gôndola"
@@ -24923,10 +25283,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24935,5 +25296,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24941,5 +25302,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24948,5 +25309,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24954,5 +25315,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Posto de Gasolina"
@@ -24962,69 +25323,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Editar Posto de Gasolina"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "ilha"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "Incremento"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25041,34 +25425,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25076,37 +25461,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25127,33 +25523,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25162,170 +25560,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Seg-Sex 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "loja"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Loja de Conveniência"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Quiosque"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Tipos de combustíveis:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Biodísel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -25333,4 +25753,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25342,6 +25763,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Estacionamento"
@@ -25350,5 +25771,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Editar Estacionamento"
@@ -25359,25 +25780,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Número de Referência"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -25386,54 +25809,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Taxa"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Vagas para Deficientes"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Vagas para Mulheres"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Vagas para Pais"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Lava Jato"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Editar Lava Jato"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Concessionária"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Editar Loja de Carros"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Oficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Editar Oficina"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "sim"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Editar Árvore"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Conteúdo"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Número de telefone"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Aluguel"
@@ -25442,10 +26009,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Editar Aluguel de Carros"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Compartilhamento"
@@ -25453,28 +26019,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Editar Compartilhamento de Carro"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Editar Bicicletário"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Capacidade"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocicleta"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Editar Auto-estrada"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Serviços"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Escala"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "ilha"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Predefinições"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Roupas"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Editar Bicicletário"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Capacidade"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Casa de Bicicleta"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Editar Loja de Bicicletas"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Editar Aluguel de Bicicletas"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25484,5 +26109,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25490,5 +26115,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -25496,5 +26121,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -25502,5 +26127,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -25508,5 +26133,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Parada do Bonde/VLT"
@@ -25515,5 +26140,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Editar Parada do Bonde/VLT"
@@ -25521,5 +26146,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Plataforma de Trens"
@@ -25528,5 +26153,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Editar Plataforma de Trens"
@@ -25538,5 +26163,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -25544,10 +26169,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Entrada do Metrô"
@@ -25556,10 +26181,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Editar Entrada do Metrô"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Cadeira de Rodas"
@@ -25568,5 +26193,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Terminal de Ônibus"
@@ -25575,5 +26200,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Editar Terminal de Ônibus"
@@ -25581,5 +26206,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Ponto de Ônibus"
@@ -25589,13 +26214,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Editar Ponto de Ônibus"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Abrigo"
@@ -25603,19 +26227,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Piso táctil"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Plataforma de Ônibus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Editar Plataforma de Ônibus"
@@ -25623,5 +26247,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Táxi"
@@ -25629,5 +26253,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Editar Ponto de Táxi"
@@ -25635,10 +26259,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Aeroporto"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25646,5 +26270,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25652,10 +26276,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25664,5 +26288,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -25670,5 +26294,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -25676,5 +26300,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -25682,5 +26306,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -25688,5 +26312,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25694,5 +26318,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25702,5 +26326,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25710,5 +26334,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangar"
@@ -25719,6 +26343,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr ""
@@ -25728,5 +26352,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25735,5 +26359,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminal"
@@ -25741,5 +26365,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Editar Terminal"
@@ -25747,15 +26371,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Viagem"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Acomodação"
@@ -25767,5 +26391,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25774,5 +26398,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Editar Hotel"
@@ -25785,8 +26409,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr ""
@@ -25810,34 +26434,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25851,168 +26475,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Número de telefone"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26020,20 +26549,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Editar Motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Chalé"
@@ -26041,10 +26570,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Editar Chalé"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Albergue"
@@ -26052,30 +26581,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Editar Albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Local de Camping"
@@ -26083,10 +26613,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Editar Local de Camping"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Comida e Bebida"
@@ -26097,5 +26627,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -26103,5 +26633,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Editar Restaurante"
@@ -26109,5 +26639,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -26115,79 +26647,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -26195,18 +26727,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26214,10 +26746,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Café"
@@ -26225,10 +26757,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -26236,20 +26773,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar"
@@ -26257,10 +26794,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Boate"
@@ -26268,25 +26805,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Atração"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museu"
@@ -26294,9 +26831,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoológico"
@@ -26305,9 +26842,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Parque Temático"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Editar Parque Temático"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Arte"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Editar Arte"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -26315,50 +26873,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Parque Temático"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Editar Parque Temático"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Arte"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Editar Arte"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Editar Abrigo"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Lareira"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Campo de Picnic"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Editar Campo de Picnic"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -26396,5 +26955,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26402,28 +26961,28 @@
 msgstr "estrada"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "região"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -26433,5 +26992,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -26439,5 +26998,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr ""
@@ -26445,6 +27004,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -26452,5 +27011,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -26458,6 +27017,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Esqui"
@@ -26465,5 +27024,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -26471,46 +27030,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... outros modos de transporte possíveis"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "vida selvagem"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26519,5 +27078,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -26525,55 +27084,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Editar Abrigo"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Lareira"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Campo de Picnic"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Editar Campo de Picnic"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Castelo"
@@ -26582,19 +27120,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -26603,9 +27141,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -26613,10 +27151,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -26624,5 +27162,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26630,15 +27168,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Memorial"
@@ -26646,55 +27184,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Parquinho"
@@ -26702,35 +27240,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Esportes"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -26744,6 +27282,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -27159,6 +27697,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27193,240 +27731,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -27443,5 +27981,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27468,23 +28005,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tipo"
@@ -27501,5 +28046,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27526,211 +28070,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr ""
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr ""
@@ -27738,52 +28285,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Dificuldade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr ""
@@ -27791,204 +28338,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Futebol Australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Editar Futebol Australiano"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basquetebol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Editar Basquetebol"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Editar Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Críquete"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Editar Críquete"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Editar Hockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Tênis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Editar Tênis de Mesa"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Editar Tênis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Barco motorizado"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Editar Médicos"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Aviso"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Editar Estacionamento"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Automóveis"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Editar Médicos"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Editar Lavanderia à Seco"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Editar Motel"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Carro"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Editar Bar"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Construção humana"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Edificação"
@@ -27996,5 +28609,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -28002,10 +28615,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -28013,10 +28626,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Embaixada"
@@ -28024,10 +28637,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Fórum"
@@ -28036,10 +28649,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Presídio"
@@ -28048,10 +28661,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polícia"
@@ -28061,10 +28674,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -28073,10 +28686,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Correios"
@@ -28084,5 +28697,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -28090,15 +28703,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Escola"
@@ -28106,10 +28719,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universidade"
@@ -28117,10 +28730,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Faculdade"
@@ -28128,5 +28741,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -28134,5 +28747,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Cinema"
@@ -28141,10 +28754,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Biblioteca"
@@ -28153,9 +28766,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -28163,10 +28776,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teatro"
@@ -28175,10 +28788,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -28188,5 +28801,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -28195,6 +28808,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religião"
@@ -28203,66 +28816,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Denominação"
@@ -28271,189 +28884,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunismo"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Endereços"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Editar Informações de Endereço"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Número da casa"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Nome da casa"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Nome do rua"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Cidade"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "CEP"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Código do país"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Editar Interpolação de Endereços"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Esquema de numeração"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "números ímpares"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "números pares"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "alfabético"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Construção humana"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "comunicação"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "observação"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Altura (metros)"
@@ -28461,25 +29004,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Farol"
@@ -28487,10 +29030,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -28498,10 +29041,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Cano"
@@ -28510,41 +29053,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "gás"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "calor"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "petróleo"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "qualquer substância"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Localidade"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "subaquático"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -28554,10 +29097,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Guindaste"
@@ -28565,5 +29108,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
@@ -28571,10 +29114,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -28582,10 +29125,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -28593,23 +29136,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -28619,35 +29162,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "carvão"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "carvão"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -28656,10 +29199,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -28668,5 +29211,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -28674,10 +29217,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -28688,23 +29231,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "polo"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -28713,20 +29256,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Tipo de Linha de Transmissão"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28734,55 +29277,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Quantidade de Cabos"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de cabos (ou condutores) por cabo-de-força"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "simples"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "duplo"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "quádruplo"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Banheiros"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefone"
@@ -28791,5 +29334,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -28797,5 +29340,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Moedas"
@@ -28803,5 +29346,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Notas"
@@ -28809,5 +29352,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Carteiras Eletrónicas ou Cartões pré-pagos"
@@ -28815,5 +29358,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Cartões de Débito"
@@ -28821,15 +29364,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -28838,5 +29381,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Editar Centro de Reciclagem"
@@ -28844,35 +29387,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Latas"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Roupas"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Cesta de Lixo"
@@ -28880,5 +29418,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Editar Cesta de Lixo"
@@ -28887,31 +29425,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "rocha"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "preto"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "marrom"
@@ -28990,5 +29528,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28998,31 +29536,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "vermelho"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "cinza"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Número de Assentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -29030,31 +29568,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "metade"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "cheio"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Ocutar"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Chafariz"
@@ -29063,10 +29601,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -29075,10 +29613,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Hidrante"
@@ -29087,5 +29625,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Editar Hidrante"
@@ -29093,501 +29631,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "A Pé"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermercado"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Editar Supermercado"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Loja de Conveniência"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Editar Loja de Conveniência"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Quiosque"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Editar Quiosque"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Açougue"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Editar Açougue"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Padaria"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Editar Padaria"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Orgânicos"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Editar Loja de Orgânicos"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Álcool"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Editar"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Bebidas"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Editar Loja de Bebidas"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Lojas"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Cabelereiro"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Editar Cabelereiro"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Óculos"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Editar Loja de Óculos"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Editar Loja de Computador"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Sapatos"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Editar Loja de Sapatos"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Outdoor"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Editar Loja de Esportes"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Lavanderia à Seco"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Editar Lavanderia à Seco"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Lavanderia"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Editar Lavanderia"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Tamoil"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Editar Torre"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Computador"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Editar Loja de Computador"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Eletrônicos"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Editar Loja de Eletrônicos"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Equipamentos de Áudio"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Editar Loja de Equipamentos de Áudio"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Locadora de Vídeo"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Editar Locadora de Vídeo"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Floricultura"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Editar Floricultura"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Loja de Plantas"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Editar Loja de Plantas"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Componente físico"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Editar Loja de Utilidades Domésticas"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Loja de Ferragens"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Editar Loja de Ferragens"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Móveis"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Editar Loja de Móveis"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Papelaria"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Editar Papelaria"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Livraria"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Editar Livraria"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Agência de Viagem"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Editar Agência de Viagem"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Brinquedos"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Editar Loja de Brinquedos"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr ""
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Editar Máquina de Vendas"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Produtos à venda"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "tíquetes de transporte público"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "mapas de transporte público"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "tíquetes de estacionamento"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "comida"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "bebidas"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "doces"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigarros"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotos"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "ração animal"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "jornais"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "brinquedos"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "selos"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "Cartões SIM"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "vales"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "preservativos"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "absorventes"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "sacos para fezes"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Cartões de fidelidade"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Dinheiro"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banco"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Editar Banco"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Caixa Eletrônico"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Loja de Câmbio"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Editar Loja de Câmbio"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Editar Caixa Eletrônico"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Saúde"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Médicos"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Editar Médicos"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dentistas"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Editar Dentistas"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Farmácia"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Editar Farmácia"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr ""
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hospital"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Editar Hospital"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Berçário"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Editar Berçário"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Lojas"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Concessionária"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Editar Loja de Carros"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Casa de Bicicleta"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Editar Loja de Bicicletas"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermercado"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Editar Supermercado"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Loja de Conveniência"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Editar Loja de Conveniência"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Quiosque"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Editar Quiosque"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Livraria"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Editar Livraria"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Agência de Viagem"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Editar Agência de Viagem"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Açougue"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Editar Açougue"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Padaria"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Editar Padaria"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Floricultura"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Editar Floricultura"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Orgânicos"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Editar Loja de Orgânicos"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Álcool"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Editar"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Bebidas"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Editar Loja de Bebidas"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Computador"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Editar Loja de Computador"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Eletrônicos"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Editar Loja de Eletrônicos"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Equipamentos de Áudio"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Editar Loja de Equipamentos de Áudio"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Móveis"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Editar Loja de Móveis"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Loja de Plantas"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Editar Loja de Plantas"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Componente físico"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Editar Loja de Utilidades Domésticas"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Loja de Ferragens"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Editar Loja de Ferragens"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Papelaria"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Editar Papelaria"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Cabelereiro"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Editar Cabelereiro"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Sapatos"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Editar Loja de Sapatos"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Brinquedos"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Editar Loja de Brinquedos"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Locadora de Vídeo"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Editar Locadora de Vídeo"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Lavanderia à Seco"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Editar Lavanderia à Seco"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Lavanderia"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Editar Lavanderia"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Outdoor"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Editar Loja de Esportes"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Óculos"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Editar Loja de Óculos"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr ""
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Editar Máquina de Vendas"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Produtos à venda"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "tíquetes de transporte público"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "mapas de transporte público"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "tíquetes de estacionamento"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "comida"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "bebidas"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "doces"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigarros"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotos"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "ração animal"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "jornais"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "brinquedos"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "selos"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "Cartões SIM"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "vales"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "preservativos"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "absorventes"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "sacos para fezes"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Cartões de fidelidade"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Dinheiro"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banco"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Editar Banco"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Caixa Eletrônico"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Loja de Câmbio"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Editar Loja de Câmbio"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Editar Caixa Eletrônico"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Saúde"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Médicos"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Editar Médicos"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dentistas"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Editar Dentistas"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Farmácia"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Editar Farmácia"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr ""
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hospital"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Editar Hospital"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -29596,5 +30136,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -29603,15 +30143,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Número do Ponto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -29619,5 +30159,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -29626,368 +30166,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Fronteiras"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nacional"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Editar Fronteiras Nacionais"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrativo"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Editar Fronteiras Administrativas"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Editar Fronteiras Civis"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Político"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Editar Fronteiras Políticas"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Parque nacional"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Editar Fronteira de Parque Nacional"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Lugares"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Continente"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "País"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Editar País"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Estado"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Editar Estado"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Região"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Editar Região"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Condado"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Editar Condado"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Cidade"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Bairro"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Vilarejo"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr ""
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr ""
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Localidade"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Pico"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Editar Pico"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Geleira"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Editar Geleira"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulcão"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Editar Vulcão"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Entrada de Caverna"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Editar Entrada de Caverna"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Ilha"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Ilhota"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Editar Ilhota"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "natureza"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Árvore"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Editar Árvore"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Nome Botânico"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Floresta"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Editar Floresta"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "conífera"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "decídua"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "misturado"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Floresta"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Editar zona Florestal"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Reserva Natural"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Editar Reserva Natural"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Entrada de Caverna"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Editar Entrada de Caverna"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Pico"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Editar Pico"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Geleira"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Editar Geleira"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulcão"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Editar Vulcão"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Fronteiras"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nacional"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Editar Fronteiras Nacionais"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrativo"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Editar Fronteiras Administrativas"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Editar Fronteiras Civis"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Político"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Editar Fronteiras Políticas"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Parque nacional"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Editar Fronteira de Parque Nacional"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr ""
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Editar rocha"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Arbusto"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Editar arbusto"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Matagal"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Editar matagal"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Árvore"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Editar Árvore"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Nome Botânico"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Floresta"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Editar Floresta"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "conífera"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "decídua"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "misturado"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Floresta"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Editar zona Florestal"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Reserva Natural"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Editar Reserva Natural"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr ""
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Arbusto"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Editar arbusto"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Editar rocha"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Matagal"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Editar matagal"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Fazenda"
@@ -29996,45 +30542,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Terra agrícola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Editar zona Agrícola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vinhedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Editar zona de Vinhedos"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Hortas comunitárias"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -30042,25 +30588,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Jardim"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Grama"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Editar zona de Gramado"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -30068,10 +30614,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Comum"
@@ -30079,20 +30625,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -30100,5 +30646,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -30106,15 +30652,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Editar zona Residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -30122,9 +30668,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -30132,39 +30678,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Editar zona de Cemitério"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Comércio"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Editar zona Industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -30172,15 +30718,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Editar zona Militar"
@@ -30188,52 +30734,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Editar zona para Construção"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Aterro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Editar Aterro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr ""
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Estação"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Endereços"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Editar Informações de Endereço"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Número da casa"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Nome da casa"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Nome do rua"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Cidade"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "CEP"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Código do país"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "L"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Editar Interpolação de Endereços"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Esquema de numeração"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "números ímpares"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "números pares"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "alfabético"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Conteúdo"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Adicionar informação do autor"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Imagem"
 
 #. item "Relations/Multipolygon"
@@ -30241,5 +30920,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -30251,5 +30930,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "segmento externo"
@@ -30257,5 +30936,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "segmento interno"
@@ -30263,5 +30942,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -30272,5 +30951,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -30278,36 +30957,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -30315,5 +30994,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -30322,5 +31001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -30328,34 +31007,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "somente_a_esquerda"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -30364,15 +31043,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "para caminho"
@@ -30380,5 +31059,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Rota"
@@ -30387,5 +31066,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Editar Rota"
@@ -30393,132 +31072,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Tipo de rota"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicicleta"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "barca"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "Esqui"
@@ -30586,5 +31154,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30594,9 +31162,9 @@
 msgstr "a pé"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "desvio"
@@ -30610,10 +31178,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -30621,31 +31189,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "conexão"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -30654,30 +31222,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
@@ -34655,7 +35223,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34777,8 +35344,14 @@
 msgstr "Sicilia - Italia"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Manter arquivos de backup"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Ponto de Hidrovia"
 
 #~ msgid "Uploading..."
@@ -35165,7 +35738,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Sincronizar Tempo com Unidade GPS"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
 
 #~ msgid ""
@@ -35437,7 +36007,4 @@
 #~ msgstr "futebol americano"
 
-#~ msgid "Motorboat"
-#~ msgstr "Barco motorizado"
-
 #~ msgid "Footway"
 #~ msgstr "Calçada"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 22859)
+++ applications/editors/josm/i18n/po/ro.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-14 00:39+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 00:33+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -79,5 +79,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -98,5 +98,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Avertisment"
@@ -124,9 +124,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Editor Java OpenStreetMap"
@@ -134,5 +134,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -275,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -298,5 +298,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -407,4 +407,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -422,5 +423,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1044,5 +1045,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1062,5 +1063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr ""
@@ -1442,13 +1443,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1457,5 +1458,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1463,9 +1464,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1473,5 +1474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1505,8 +1506,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1515,9 +1516,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1533,6 +1534,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1542,5 +1543,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1565,6 +1566,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Eroare"
@@ -1723,5 +1724,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr ""
@@ -1991,5 +1992,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2452,5 +2453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2491,18 +2492,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2760,5 +2761,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Căutare"
@@ -2948,7 +2949,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3211,5 +3212,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3363,31 +3364,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3406,15 +3407,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3423,5 +3424,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3430,5 +3431,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3437,5 +3438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3444,5 +3445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3450,5 +3451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3457,5 +3458,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3464,5 +3465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3471,5 +3472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3478,10 +3479,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3601,5 +3602,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3671,9 +3672,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3681,5 +3682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3871,14 +3872,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "Despre"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+msgid "Hemisphere"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3903,9 +3922,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3948,5 +3967,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr ""
@@ -3967,5 +3986,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4214,69 +4233,69 @@
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4286,9 +4305,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4296,57 +4315,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Se creează interfața grafică"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Renunţ şi Ies"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4356,9 +4385,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4372,9 +4401,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4496,23 +4526,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "stratul nu este în listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4603,5 +4633,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4609,17 +4639,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4629,25 +4659,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5042,4 +5072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5122,4 +5153,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5136,4 +5168,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5207,5 +5240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5217,10 +5250,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "nici unul"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr ""
@@ -5302,5 +5335,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5312,5 +5345,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5345,17 +5378,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5363,15 +5396,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5379,10 +5412,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5394,5 +5427,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5404,5 +5437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5547,5 +5580,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5660,5 +5693,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5666,5 +5699,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5672,5 +5705,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5678,5 +5711,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5684,5 +5717,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5691,5 +5724,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5697,5 +5730,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5703,5 +5736,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5709,24 +5742,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5747,5 +5780,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5770,37 +5803,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Introdu coordonatele pentru noul nod."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Foloseşte grade zecimale"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valorile negative denotă emisfera Vestică/Sudică"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5856,9 +5889,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr ""
@@ -5906,10 +5939,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5929,37 +5962,37 @@
 msgstr "Deschide o fereastra cu o listă de selecţie."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5968,32 +6001,32 @@
 msgstr "Selecţie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6270,13 +6303,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6388,4 +6421,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6404,6 +6441,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6421,8 +6456,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6433,4 +6475,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6445,33 +6493,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6495,12 +6532,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6572,10 +6619,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6605,8 +6656,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6669,6 +6716,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6721,4 +6766,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6783,32 +6840,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6817,6 +6882,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6825,24 +6892,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6857,82 +6914,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7013,155 +7070,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Nume"
@@ -7585,4 +7647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<diferit>"
@@ -8088,17 +8151,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8373,4 +8436,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8378,15 +8442,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr ""
@@ -8405,16 +8469,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "necunoscut"
@@ -8979,5 +9043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9200,20 +9264,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Strat"
@@ -9662,5 +9726,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Sfârşit GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9668,62 +9790,18 @@
 msgstr "punct gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] ""
 msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9731,10 +9809,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9745,7 +9823,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9753,10 +9831,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9764,10 +9842,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9775,21 +9853,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9799,9 +9877,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9809,5 +9887,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9815,30 +9893,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Utilizează opţiunile globale."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte pentru acest strat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Nu trasa linii între puncte pentru acest strat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Selectaţi opţiunile pentru trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9846,5 +9924,5 @@
 msgstr "Personalizează culoarea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9853,5 +9931,5 @@
 msgstr "Implicit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9860,18 +9938,18 @@
 msgstr "Alegeţi o culoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9881,23 +9959,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importă imagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10334,15 +10412,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11273,4 +11351,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, java-format
+msgid "Default value: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11353,5 +11474,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr ""
@@ -11370,16 +11491,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr ""
@@ -11413,12 +11534,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr ""
@@ -11666,18 +11787,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -11994,26 +12115,18 @@
 msgstr "Proiecția {0} nu a putut fi activată. Se folosește Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12129,6 +12242,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+msgid "Internal style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12345,12 +12466,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12530,5 +12643,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12537,49 +12650,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12589,15 +12702,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Eroare la prelucrarea {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12608,17 +12721,17 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13222,5 +13335,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13318,5 +13431,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13325,5 +13438,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13392,5 +13505,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13400,10 +13513,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13411,5 +13524,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13417,5 +13530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13423,10 +13536,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13434,5 +13547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13440,5 +13553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13446,5 +13559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13453,10 +13566,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13464,9 +13577,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13474,11 +13587,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Obiect ilegal cu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13490,8 +13603,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13505,5 +13618,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13511,5 +13624,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13518,6 +13631,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13529,6 +13642,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13537,5 +13650,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13543,5 +13656,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13549,12 +13662,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13562,5 +13675,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13570,5 +13683,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13578,5 +13691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13584,17 +13697,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14090,11 +14203,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14103,16 +14216,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14121,5 +14234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14140,13 +14253,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Raportează eroarea"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14155,9 +14268,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Excepţie netratată"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14165,5 +14278,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14171,5 +14284,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14178,5 +14291,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14184,9 +14297,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14380,5 +14493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14431,5 +14544,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14439,5 +14552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14445,5 +14558,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14452,5 +14565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -14551,5 +14664,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14635,10 +14748,59 @@
 msgstr ""
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+msgid "edit opening_hours"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Modificare proprietăţi"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Alegeţi"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, java-format
+msgid "apply {0}"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Unealtă: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+msgid "open end"
+msgstr ""
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr ""
@@ -14810,51 +14972,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Nu pot muta obiecte în afara lumii."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14953,16 +15117,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -14976,5 +15132,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15087,5 +15243,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr ""
@@ -15322,5 +15478,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15735,8 +15891,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15850,6 +16002,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr ""
@@ -17201,5 +17353,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr ""
@@ -17243,48 +17395,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17293,34 +17449,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17543,58 +17699,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17878,11 +18034,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "OpenStreetMap"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -18960,5 +19115,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19078,59 +19233,59 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19609,140 +19764,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19855,7 +20010,6 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Selectează cu căutarea dată"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -19876,9 +20030,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -19937,21 +20091,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -19962,5 +20116,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -19969,5 +20123,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -19975,10 +20129,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -19987,24 +20141,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20015,75 +20169,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Salvează strat WMS în fișier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Salvează strat WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -20642,16 +20820,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20659,5 +20842,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20665,5 +20848,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20672,5 +20855,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20679,10 +20862,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20690,15 +20873,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20708,5 +20891,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20715,10 +20898,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20727,5 +20910,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20734,15 +20917,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20752,15 +20935,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20769,5 +20952,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20776,5 +20959,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20783,10 +20966,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20795,5 +20978,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20803,5 +20986,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20810,20 +20993,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20832,5 +21015,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20873,4 +21056,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20903,10 +21087,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr ""
@@ -20917,5 +21101,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -20924,5 +21108,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr ""
@@ -20959,10 +21143,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr ""
@@ -20976,8 +21160,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr ""
@@ -20996,13 +21180,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -21036,17 +21220,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr ""
@@ -21083,17 +21267,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21127,17 +21311,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr ""
@@ -21168,17 +21352,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr ""
@@ -21209,17 +21393,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr ""
@@ -21227,5 +21411,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr ""
@@ -21234,5 +21418,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr ""
@@ -21240,5 +21424,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr ""
@@ -21247,5 +21431,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr ""
@@ -21255,6 +21439,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21262,5 +21446,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr ""
@@ -21269,5 +21453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr ""
@@ -21280,5 +21464,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -21287,5 +21471,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr ""
@@ -21293,10 +21477,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr ""
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr ""
@@ -21308,5 +21492,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -21316,5 +21500,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr ""
@@ -21322,5 +21506,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr ""
@@ -21330,5 +21514,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -21340,5 +21524,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -21348,5 +21532,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -21356,6 +21540,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21378,15 +21562,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21398,5 +21582,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -21405,5 +21589,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr ""
@@ -21423,12 +21607,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr ""
@@ -21450,166 +21634,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21617,5 +21801,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -21624,5 +21808,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -21630,5 +21814,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr ""
@@ -21637,5 +21821,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -21643,5 +21827,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr ""
@@ -21650,5 +21834,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr ""
@@ -21658,18 +21842,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21677,5 +21861,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -21685,10 +21869,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -21697,5 +21881,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -21703,14 +21887,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr ""
@@ -21726,5 +21910,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr ""
@@ -21733,5 +21917,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr ""
@@ -21740,15 +21924,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -21756,5 +21940,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr ""
@@ -21780,4 +21964,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21785,4 +21970,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21858,236 +22049,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr ""
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr ""
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr ""
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22102,10 +22300,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr ""
@@ -22121,10 +22319,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr ""
@@ -22139,19 +22338,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -22159,20 +22358,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22180,5 +22379,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr ""
@@ -22189,5 +22388,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr ""
@@ -22207,10 +22406,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -22232,10 +22431,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22257,10 +22456,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22282,5 +22481,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22295,9 +22494,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr ""
@@ -22311,9 +22510,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr ""
@@ -22357,10 +22556,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22390,5 +22589,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22400,10 +22599,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr ""
@@ -22411,10 +22610,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22423,35 +22622,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22459,5 +22658,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr ""
@@ -22466,76 +22665,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr ""
@@ -22544,5 +22743,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22550,5 +22749,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -22556,5 +22755,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22572,11 +22771,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22584,5 +22783,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22590,5 +22789,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22596,5 +22795,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22603,5 +22802,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr ""
@@ -22609,5 +22808,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr ""
@@ -22617,10 +22816,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr ""
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr ""
@@ -22628,15 +22832,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr ""
@@ -22644,5 +22848,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -22650,10 +22854,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22682,36 +22887,55 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr ""
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+msgid "Rest Area"
+msgstr ""
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+msgid "Edit Rest Area"
+msgstr ""
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr ""
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr ""
@@ -22721,5 +22945,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -22728,27 +22952,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22756,6 +22980,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22764,11 +22988,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22776,30 +23000,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr ""
@@ -22807,67 +23031,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr ""
@@ -22878,14 +23040,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr ""
@@ -22895,5 +23119,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr ""
@@ -22901,15 +23125,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr ""
@@ -22918,11 +23142,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr ""
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22930,5 +23149,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -22936,5 +23155,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -22944,10 +23163,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr ""
@@ -22955,5 +23174,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr ""
@@ -22961,5 +23180,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -22968,10 +23187,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr ""
@@ -22979,5 +23198,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr ""
@@ -22985,5 +23204,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr ""
@@ -22991,5 +23210,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23034,16 +23253,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23052,5 +23271,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23058,5 +23277,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -23064,10 +23283,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23075,15 +23294,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr ""
@@ -23091,5 +23310,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr ""
@@ -23097,10 +23316,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr ""
@@ -23109,5 +23328,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr ""
@@ -23118,22 +23337,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr ""
@@ -23141,5 +23360,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr ""
@@ -23148,5 +23367,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23157,10 +23376,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr ""
@@ -23168,5 +23387,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr ""
@@ -23174,50 +23393,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23225,25 +23444,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23251,25 +23470,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr ""
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr ""
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr ""
@@ -23277,10 +23485,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23288,10 +23496,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr ""
@@ -23299,10 +23507,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr ""
@@ -23310,10 +23518,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr ""
@@ -23323,59 +23531,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
+msgstr ""
+
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr ""
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr ""
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr ""
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr ""
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr ""
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr ""
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr ""
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr ""
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr ""
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr ""
@@ -23384,10 +23646,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr ""
@@ -23398,14 +23661,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -23419,35 +23682,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr ""
@@ -23455,20 +23718,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr ""
@@ -23476,145 +23739,212 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr ""
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr ""
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+msgid "Shipping"
+msgstr ""
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+msgid "Cargo"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr ""
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr ""
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr ""
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr ""
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr ""
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr ""
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr ""
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr ""
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr ""
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr ""
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr ""
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr ""
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr ""
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23624,16 +23954,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr ""
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr ""
@@ -23641,5 +23993,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr ""
@@ -23669,7 +24021,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23685,8 +24037,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23700,29 +24052,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23735,8 +24087,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23807,8 +24159,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23820,8 +24172,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr ""
@@ -23834,8 +24186,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23848,23 +24200,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr ""
@@ -23872,50 +24224,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -23923,5 +24275,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23930,10 +24282,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr ""
@@ -23942,9 +24294,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr ""
@@ -23953,5 +24305,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -23960,5 +24312,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -23968,5 +24320,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -23974,5 +24326,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr ""
@@ -23981,5 +24333,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -23988,10 +24340,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr ""
@@ -23999,10 +24351,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24010,10 +24362,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr ""
@@ -24021,10 +24373,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24032,10 +24384,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24044,5 +24397,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24050,5 +24403,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24057,5 +24410,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24063,5 +24416,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr ""
@@ -24071,69 +24424,90 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr ""
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+msgid "Brand"
+msgstr ""
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24150,34 +24524,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24185,37 +24560,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24236,33 +24622,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24271,170 +24659,189 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+msgid "With shop"
+msgstr ""
+
+#: build/trans_presets.java:1359
+msgid "convenience"
+msgstr ""
+
+#: build/trans_presets.java:1359
+msgid "kiosk"
+msgstr ""
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24442,4 +24849,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24451,6 +24859,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr ""
@@ -24459,5 +24867,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr ""
@@ -24468,25 +24876,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24495,54 +24905,196 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr ""
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr ""
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr ""
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+msgid "Tyres"
+msgstr ""
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+msgid "Edit Tyres"
+msgstr ""
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Contactez {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr ""
@@ -24551,10 +25103,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr ""
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr ""
@@ -24562,17 +25113,70 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
+msgstr ""
+
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+msgid "Edit Motorcycle Parking"
+msgstr ""
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr ""
+
+#: build/trans_presets.java:1459
+msgid "Motorcycle Dealer"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+msgid "Edit Shop Motorcycle"
+msgstr ""
+
+#: build/trans_presets.java:1467
+msgid "Services:"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Salvează"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+msgid "brand"
+msgstr ""
+
+#: build/trans_presets.java:1471
+msgid "Parts"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
 msgstr ""
 
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr ""
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
 msgstr ""
 
@@ -24580,10 +25184,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24593,5 +25197,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24599,5 +25203,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24605,5 +25209,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -24611,5 +25215,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -24617,5 +25221,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr ""
@@ -24624,5 +25228,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr ""
@@ -24630,5 +25234,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr ""
@@ -24637,5 +25241,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr ""
@@ -24647,5 +25251,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24653,10 +25257,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr ""
@@ -24665,10 +25269,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr ""
@@ -24677,5 +25281,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr ""
@@ -24684,5 +25288,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr ""
@@ -24690,5 +25294,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr ""
@@ -24698,13 +25302,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr ""
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr ""
@@ -24712,19 +25315,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr ""
@@ -24732,5 +25335,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr ""
@@ -24738,5 +25341,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr ""
@@ -24744,10 +25347,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr ""
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24755,5 +25358,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24761,10 +25364,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr ""
@@ -24773,5 +25376,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24779,5 +25382,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24785,5 +25388,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24791,5 +25394,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24797,5 +25400,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24803,5 +25406,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24811,5 +25414,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24819,5 +25422,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24828,6 +25431,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr ""
@@ -24837,5 +25440,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24844,5 +25447,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24850,5 +25453,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24856,15 +25459,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr ""
@@ -24876,5 +25479,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -24883,5 +25486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr ""
@@ -24894,8 +25497,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr ""
@@ -24919,34 +25522,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -24960,168 +25563,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr ""
@@ -25129,20 +25637,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr ""
@@ -25150,10 +25658,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr ""
@@ -25161,30 +25669,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr ""
@@ -25192,10 +25701,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr ""
@@ -25206,5 +25715,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -25212,5 +25721,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr ""
@@ -25218,5 +25727,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr ""
@@ -25224,79 +25735,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr ""
@@ -25304,18 +25815,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25323,10 +25834,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr ""
@@ -25334,10 +25845,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr ""
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr ""
@@ -25345,20 +25861,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25366,10 +25882,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr ""
@@ -25377,25 +25893,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr ""
@@ -25403,9 +25919,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr ""
@@ -25414,9 +25930,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr ""
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr ""
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr ""
@@ -25424,50 +25961,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr ""
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr ""
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr ""
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr ""
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25505,5 +26043,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25511,28 +26049,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25542,5 +26080,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25548,5 +26086,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr ""
@@ -25554,6 +26092,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr ""
@@ -25561,5 +26099,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25567,6 +26105,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr ""
@@ -25574,5 +26112,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25580,46 +26118,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25628,5 +26166,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25634,55 +26172,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr ""
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr ""
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr ""
@@ -25691,19 +26208,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr ""
@@ -25712,9 +26229,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr ""
@@ -25722,10 +26239,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25733,5 +26250,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25739,15 +26256,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr ""
@@ -25755,55 +26272,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr ""
@@ -25811,35 +26328,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr ""
@@ -25853,6 +26370,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr ""
@@ -26268,6 +26785,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26302,240 +26819,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26552,5 +27069,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26577,23 +27093,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr ""
@@ -26610,5 +27134,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26635,211 +27158,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr ""
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr ""
@@ -26847,52 +27373,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr ""
@@ -26900,204 +27426,261 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+msgid "Motorsport"
+msgstr ""
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+msgid "Edit Motorsport"
+msgstr ""
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Avertisment"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+msgid "Edit Karting"
+msgstr ""
+
+#: build/trans_presets.java:2461
+msgid "Motocross"
+msgstr ""
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+msgid "Edit Motocross"
+msgstr ""
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+msgid "Edit Safety Training"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+msgid "Edit Model Aerodrome"
+msgstr ""
+
+#: build/trans_presets.java:2480
+msgid "RC Car"
+msgstr ""
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+msgid "Edit RC Car"
+msgstr ""
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr ""
@@ -27105,5 +27688,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr ""
@@ -27111,10 +27694,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr ""
@@ -27122,10 +27705,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr ""
@@ -27133,10 +27716,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr ""
@@ -27145,10 +27728,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr ""
@@ -27157,10 +27740,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr ""
@@ -27170,10 +27753,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr ""
@@ -27182,10 +27765,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr ""
@@ -27193,5 +27776,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr ""
@@ -27199,15 +27782,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr ""
@@ -27215,10 +27798,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr ""
@@ -27226,10 +27809,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr ""
@@ -27237,5 +27820,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr ""
@@ -27243,5 +27826,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr ""
@@ -27250,10 +27833,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr ""
@@ -27262,9 +27845,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr ""
@@ -27272,10 +27855,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr ""
@@ -27284,10 +27867,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr ""
@@ -27297,5 +27880,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr ""
@@ -27304,6 +27887,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr ""
@@ -27312,66 +27895,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr ""
@@ -27380,189 +27963,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
+#: build/trans_presets.java:2612
+msgid "Man Made"
+msgstr ""
+
+#. group "Man Made"
+#: build/trans_presets.java:2613
+msgid "Works"
+msgstr ""
+
+#. item "Man Made/Works"
+#: build/trans_presets.java:2614
+msgid "Edit Works"
+msgstr ""
+
+#. item "Man Made/Works" text "Name"
+#: build/trans_presets.java:2618
+msgid "Tower"
+msgstr ""
+
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2619
+msgid "Edit Tower"
+msgstr ""
+
+#. item "Man Made/Tower" text "Name"
+#: build/trans_presets.java:2622
+msgid "Tower type"
+msgstr ""
+
+#. item "Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2622
+msgid "communication"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "observation"
+msgstr ""
+
 #. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr ""
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr ""
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
-msgid "Man Made"
-msgstr ""
-
-#. group "Man Made"
-#: build/trans_presets.java:2519
-msgid "Works"
-msgstr ""
-
-#. item "Man Made/Works"
-#: build/trans_presets.java:2520
-msgid "Edit Works"
-msgstr ""
-
-#. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
-msgid "Tower"
-msgstr ""
-
-#. item "Man Made/Tower"
-#: build/trans_presets.java:2525
-msgid "Edit Tower"
-msgstr ""
-
-#. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
-msgid "Tower type"
-msgstr ""
-
-#. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
-msgid "communication"
-msgstr ""
-
-#: build/trans_presets.java:2528
-msgid "observation"
-msgstr ""
-
-#. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27570,25 +28083,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr ""
@@ -27596,10 +28109,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr ""
@@ -27607,10 +28120,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr ""
@@ -27619,41 +28132,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr ""
@@ -27663,10 +28176,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr ""
@@ -27674,5 +28187,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr ""
@@ -27680,10 +28193,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr ""
@@ -27691,10 +28204,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr ""
@@ -27702,23 +28215,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr ""
@@ -27728,35 +28241,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr ""
@@ -27765,10 +28278,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr ""
@@ -27777,5 +28290,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27783,10 +28296,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr ""
@@ -27797,23 +28310,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr ""
@@ -27822,20 +28335,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27843,55 +28356,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr ""
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr ""
@@ -27900,5 +28413,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr ""
@@ -27906,5 +28419,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr ""
@@ -27912,5 +28425,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr ""
@@ -27918,5 +28431,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27924,5 +28437,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr ""
@@ -27930,15 +28443,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr ""
@@ -27947,5 +28460,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr ""
@@ -27953,35 +28466,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr ""
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -27989,5 +28497,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27996,31 +28504,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28099,5 +28607,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28107,31 +28615,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28139,31 +28647,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr ""
@@ -28172,10 +28680,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr ""
@@ -28184,10 +28692,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28196,5 +28704,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28202,120 +28710,215 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+msgid "Food"
+msgstr ""
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr ""
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr ""
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr ""
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr ""
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr ""
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr ""
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr ""
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr ""
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr ""
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr ""
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr ""
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr ""
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr ""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr ""
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr ""
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr ""
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr ""
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr ""
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr ""
-
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr ""
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr ""
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr ""
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+msgid "Edit Clothes Shop"
+msgstr ""
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr ""
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr ""
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr ""
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr ""
+
+#: build/trans_presets.java:2938
+msgid "Tailor"
+msgstr ""
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+msgid "Edit Tailor"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2970
 msgid "Florist"
 msgstr ""
@@ -28323,73 +28926,9 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2972
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2977
 msgid "Garden Centre"
 msgstr ""
@@ -28397,9 +28936,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2979
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2984
 msgid "Hardware"
 msgstr ""
@@ -28407,9 +28946,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2986
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2991
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -28417,99 +28956,55 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2993
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:3004
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3005
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr ""
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr ""
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr ""
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr ""
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr ""
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr ""
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr ""
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr ""
@@ -28517,5 +29012,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr ""
@@ -28523,97 +29018,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr ""
@@ -28621,14 +29116,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr ""
@@ -28636,5 +29131,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr ""
@@ -28642,15 +29137,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr ""
@@ -28658,18 +29153,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr ""
@@ -28677,5 +29172,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr ""
@@ -28683,9 +29178,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr ""
@@ -28693,10 +29188,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -28705,5 +29211,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28712,15 +29218,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28728,5 +29234,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr ""
@@ -28735,368 +29241,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr ""
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr ""
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr ""
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr ""
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr ""
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr ""
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr ""
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr ""
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr ""
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr ""
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr ""
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr ""
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr ""
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr ""
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr ""
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr ""
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr ""
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr ""
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr ""
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr ""
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr ""
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr ""
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr ""
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr ""
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr ""
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr ""
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr ""
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr ""
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr ""
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr ""
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr ""
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr ""
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr ""
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr ""
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr ""
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr ""
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr ""
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr ""
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr ""
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr ""
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr ""
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr ""
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr ""
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr ""
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr ""
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
-msgid "Land use"
-msgstr ""
-
-#. group "Land use"
-#: build/trans_presets.java:3179
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Nume"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
 msgid "Tree"
 msgstr ""
 
-#. item "Land use/Tree"
+#. item "Nature/Tree"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3281
 msgid "Edit Tree"
 msgstr ""
 
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
 msgid "Botanical Name"
 msgstr ""
 
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
 msgid "Wood"
 msgstr ""
 
-#. item "Land use/Wood"
+#. item "Nature/Wood"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3291
 msgid "Edit Wood"
 msgstr ""
 
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3296
 msgid "Forest"
 msgstr ""
 
-#. item "Land use/Forest"
+#. item "Nature/Forest"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3299
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3305
 msgid "Nature Reserve"
 msgstr ""
 
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
 msgid "Edit Nature Reserve"
 msgstr ""
 
-#. item "Land use/Nature Reserve" text "Name"
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3311
 msgid "Scree"
 msgstr ""
 
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
 msgid "Edit Scree"
 msgstr ""
 
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
 msgid "Scrub"
 msgstr ""
 
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
 msgid "Edit Scrub"
 msgstr ""
 
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
 msgid "Heath"
 msgstr ""
 
-#. item "Land use/Heath"
+#. item "Nature/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3329
 msgid "Edit Heath"
 msgstr ""
 
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
+msgid "Land use"
+msgstr ""
+
+#. group "Land use"
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr ""
@@ -29105,45 +29617,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29151,25 +29663,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29177,10 +29689,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29188,20 +29700,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr ""
@@ -29209,5 +29721,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29215,15 +29727,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr ""
@@ -29231,9 +29743,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr ""
@@ -29241,39 +29753,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -29281,15 +29793,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29297,52 +29809,180 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr ""
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Informaţii"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr ""
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr ""
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr ""
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr ""
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr ""
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr ""
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr ""
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr ""
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+msgid "AT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "DE"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "IT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "US"
+msgstr ""
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr ""
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr ""
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Conflict"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Adaugă informaţii despre autor"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "imagine"
 
 #. item "Relations/Multipolygon"
@@ -29350,5 +29990,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29360,5 +30000,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29366,5 +30006,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29372,5 +30012,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29381,5 +30021,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29387,36 +30027,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29424,5 +30064,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -29431,5 +30071,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29437,34 +30077,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr ""
@@ -29473,15 +30113,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr ""
@@ -29489,5 +30129,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29496,5 +30136,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29502,132 +30142,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr ""
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29695,5 +30224,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29703,9 +30232,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29719,10 +30248,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -29730,31 +30259,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -29763,30 +30292,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -33764,7 +34293,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -33886,5 +34414,5 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
@@ -33910,7 +34438,4 @@
 #~ "în lista de istoric."
 
-#~ msgid "Contact {0}..."
-#~ msgstr "Contactez {0}..."
-
 #~ msgid "Merging conflicts."
 #~ msgstr "Îmbin conflictele."
@@ -33930,7 +34455,4 @@
 #~ msgid "GPS start: {0}"
 #~ msgstr "Start GPS: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Sfârşit GPS: {0}"
 
 #~ msgid "current delta: {0}s"
@@ -34008,10 +34530,4 @@
 #~ msgstr "Modulul nu a fost găsit: {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 22859)
+++ applications/editors/josm/i18n/po/ru.po	(revision 22863)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-18 11:51+0000\n"
-"Last-Translator: METAdenisik <Unknown>\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-26 14:41+0000\n"
+"Last-Translator: Yuriy <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -97,5 +97,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Предупреждение"
@@ -123,9 +123,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Редактор OpenStreetMap на Java"
@@ -133,5 +133,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -256,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -281,5 +281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -304,5 +304,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -415,4 +415,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -430,5 +431,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1065,5 +1066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1076,5 +1077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1488,13 +1489,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "Очистить"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr "Подтвердите очистку"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1506,15 +1507,17 @@
 "время отправки данных."
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
 "selected objects:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+"Следующие зависимые объекты будут очищены <br> в дополнение к выбранным "
+"объектам:"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Добавить к выделенному"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1524,5 +1527,5 @@
 "отменены.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Очистить буфер последних действий"
@@ -1556,8 +1559,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1566,9 +1569,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1584,6 +1587,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1593,5 +1596,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1616,6 +1619,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Ошибка"
@@ -1778,5 +1781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Нет, прервать"
@@ -1861,5 +1864,5 @@
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr ""
+msgstr "Текущее выделение невозможно разделить - не выделена точка."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2071,5 +2074,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2568,5 +2571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2611,9 +2614,9 @@
 "часто производится по ошибке. Действительно переместить их?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2622,9 +2625,9 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2913,5 +2916,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Поиск"
@@ -3122,7 +3125,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3401,5 +3404,5 @@
 msgstr[2] "Переместить {0} точек"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3560,31 +3563,31 @@
 msgstr "Автоматически исправлять теги"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr "Невозможно создать директорию {0}! Автосохранение будет отключено"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "Невозможно содать файл {0}. Будет использовано другое имя файла"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "Ошибка ввода-вывода при создании файла. Автосохранение пропущено: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "Невозможно удалить старый бэкап файл {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+msgstr "Ошибка! Во время создания резервной копии был удалён слой: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3603,15 +3606,15 @@
 msgstr "Неправильное значение долготы ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Предупреждение: не удается сохранить настройки в ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ошибка в файле конфигурации на строках {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3622,5 +3625,5 @@
 "не является каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3631,5 +3634,5 @@
 "является каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3640,5 +3643,5 @@
 "отсутствующий каталог настроек: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3649,5 +3652,5 @@
 "каталог настроек: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3657,5 +3660,5 @@
 "параметрами по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3666,5 +3669,5 @@
 "параметров по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3675,5 +3678,5 @@
 "к состоянию по умолчанию: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3684,5 +3687,5 @@
 "резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3693,10 +3696,10 @@
 "настроек {0} к состоянию по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3825,5 +3828,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3851,4 +3854,6 @@
 "the source dataset"
 msgstr ""
+"Объект {0} с идентификатором {1} был обозначен для изъятия, но он "
+"отсутствует в первоначальном наборе данных."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
@@ -3901,9 +3906,9 @@
 "- {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Элемент с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3911,5 +3916,5 @@
 msgstr "Невозможно слияние, потому что часть элементов новые, а часть нет"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4107,15 +4112,34 @@
 msgstr "Зона PUWG 2000 {0} (Польша)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарская проекция"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Зона UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Север"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "юг"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Перейти туда"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4139,9 +4163,9 @@
 msgstr "Гвиана RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "Франция UTM (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "Система координат UTM"
@@ -4185,5 +4209,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "железная дорога"
@@ -4204,5 +4228,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4459,70 +4483,70 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Открыть файл (любой тип файлов, который можно открыть с помощью Файл/Открыть)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Скачать расположение с URL (с lat=x&lon=y&zoom=z) как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Восстановить настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Указать язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4536,9 +4560,9 @@
 "максимальный размер выделенной памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4548,5 +4572,5 @@
 "порядке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4554,50 +4578,61 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Инициализация"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Обновление модулей..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Установка обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Несохранённый данные osm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Восстановить"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "Дебетные карты"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM нашел не сохраненный слой {0} с osm-данными. Они похожи на те, что были "
 "перед последним сбоем JOSM. Восстановить данные?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4606,5 +4641,5 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4617,9 +4652,9 @@
 "раннюю версию JOSM (совместимую с Java 5).</li></ul>Больше информации:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "Выйти из JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Все равно продолжить"
@@ -4633,9 +4668,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4759,23 +4795,23 @@
 msgstr "Пользователь:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слой ''{0}'' должен быть в списке слоёв"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Метрическая система"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Английская система мер"
@@ -4873,5 +4909,5 @@
 msgstr "Щёлкните, чтобы закрыть диалог и отменить удаление объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4881,17 +4917,17 @@
 "уровне масштабирования.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Уровень масштабирования:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "из квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "до квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4905,25 +4941,25 @@
 "корректны.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Адрес квадрата:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Назначить адрес квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Пожалуйста, введите адрес квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Текущее значение не является правильным адресом"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Пожалуйста, введите индекс квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5353,4 +5389,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5435,4 +5472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5449,4 +5487,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5522,5 +5561,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5532,10 +5571,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "ничего"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "все"
@@ -5618,5 +5657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5629,5 +5668,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5664,17 +5703,17 @@
 msgstr "Ещё не решено"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Роль:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Введите роль для всех участников отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Пометьте изменённые отношения тегом "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5684,16 +5723,16 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Ключ:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Введите ключ тега, например: <strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-"<html>Введите ключ тега, например: <strong><tt>fixme</tt></strong></html>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5701,5 +5740,5 @@
 msgstr "Значение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5708,5 +5747,5 @@
 "strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5724,5 +5763,5 @@
 "отношении место исходной.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5740,5 +5779,5 @@
 "отношении место исходной.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Назначить эту роль всем участникам"
@@ -5887,5 +5926,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -6003,5 +6042,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -6009,5 +6048,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -6015,5 +6054,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -6021,5 +6060,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -6027,5 +6066,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -6034,5 +6073,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6040,5 +6079,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6046,5 +6085,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6052,24 +6091,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фильтр активен</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> объектов скрыто"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "Отключено редактирование <b>{0}</b> объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6091,5 +6130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6114,37 +6153,37 @@
 msgstr "Подробная информация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Введите координаты новой точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Использовать десятичные градусы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Отрицательные значения обозначают западное/южное полушарие"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Пожалуйста , введите правильную широту в диапазоне -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Введите широту в диапазоне -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Пожалуйста, введите правильную долготу в диапазоне -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Введите долготу в диапазоне -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Закрыть диалог и создать новую точку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Закрыть диалог, не создавая новую точку"
@@ -6200,9 +6239,9 @@
 msgstr "Информация о слое"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Отношения"
@@ -6250,10 +6289,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Докачать с сервера участников выбранных отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Докачать участников"
@@ -6273,37 +6312,37 @@
 msgstr "Показать окно со списком выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Поиск объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Приблизиться к выделенному"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Приблизиться к выделенным элементам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Запустить редактор отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Запустить редактор отношений для выделеного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Выбрать в списке отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Выбрать отношение в списке отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6312,27 +6351,27 @@
 msgstr "Выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Получить подробную информацию о внутреннем состоянии объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Проверить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6341,5 +6380,5 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Нажимте для уменьшения/увеличения содержимого панели"
@@ -6631,13 +6670,13 @@
 msgstr "Не к чему приблизиться"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Содержимое пакета правок еще не загружено."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Скачать с сервера сейчас"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Скачать содержимое пакета правок"
@@ -6749,4 +6788,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6765,6 +6808,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6782,8 +6823,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6794,4 +6842,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6806,33 +6860,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6856,12 +6899,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6933,10 +6986,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6966,8 +7023,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -7030,6 +7083,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7082,4 +7133,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7144,32 +7207,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7178,6 +7249,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7186,24 +7259,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7218,82 +7281,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7374,155 +7437,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Название"
@@ -7995,4 +8063,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<различные>"
@@ -8504,4 +8573,6 @@
 "current layer"
 msgstr ""
+"Элементы из буфера обмена не могут быть добавлены потому, что они не "
+"относятся к текущему слою"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8545,17 +8616,17 @@
 "Ошибка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "включая непосредственные дочерние элементы отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Скачать родителей отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Скачивание родителей отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Изменить выбранное отношение"
@@ -8848,4 +8919,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8853,15 +8925,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Тип"
@@ -8880,16 +8952,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "неизвестно"
@@ -9527,5 +9599,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Открыть диалог выбора файла"
@@ -9793,20 +9865,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Уровень"
@@ -9909,8 +9981,15 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Ваш комментарий — <i>пустой</i> или <i>слишком короткий</i>.<br /><br /"
+">Технически, его можно оставить таким, но учтите, что многие "
+"пользователи<br />просматривают изменения в этой области и желают видеть "
+"понятные объяснения того,<br /> что здесь было изменено.<br /><br />Если "
+"сейчас вы потратите минуту на объяснение того, что вы сделали,<br />это "
+"поможет облегчить работу других участников проекта."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
 msgstr ""
+"Вернуться в предыдущий диалог, чтобы добавить более развёрнутые комментарии"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
@@ -10320,11 +10399,6 @@
 msgstr[2] "Удалить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr "точка GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10332,5 +10406,6 @@
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10338,5 +10413,5 @@
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -10347,23 +10422,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr "Период"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr "Длина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
 msgstr "Длина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -10373,5 +10451,6 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -10381,10 +10460,24 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr "точка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} трек"
+msgstr[1] "{0} трека"
+msgstr[2] "{0} треков"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10394,10 +10487,10 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10408,7 +10501,7 @@
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10416,10 +10509,10 @@
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10427,10 +10520,10 @@
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10438,21 +10531,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Загрузить возле:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "только трек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "только дорожные точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "треки и дорожные точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10464,9 +10557,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10476,5 +10569,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10484,30 +10577,30 @@
 "проигнорированы при расчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Использовать глобальные настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Отображать линии между точками для этого слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Не отображать линии между точками для этого слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Выбрать варианты отрисовки линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10515,5 +10608,5 @@
 msgstr "Выбрать цвет"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10522,5 +10615,5 @@
 msgstr "По умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10529,18 +10622,18 @@
 msgstr "Выбор цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Маркеры из именованых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Именованные точки трека из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Импортировать аудиофайлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10553,23 +10646,23 @@
 "аудиоданными.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Импорт невозможен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудиофайлы Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудиомаркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Импорт изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -11036,15 +11129,15 @@
 msgstr "Невозможно удалить файл изображения."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Изображений нет"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Загрузка {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -12104,4 +12197,50 @@
 msgid "Voice recorder calibration"
 msgstr "Калибровка звукозаписи"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Интервал обновления (в днях):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Значение по умолчанию - ’’{0}’’."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"При сохранении, оставлять резервные копии файлов (в конце названия ставится "
+"~)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Резервное копирование"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Указать, будете ли вы создавать резервные файлы"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12189,5 +12328,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Автомобиль"
@@ -12206,16 +12345,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Вело"
@@ -12249,12 +12388,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Пешком"
@@ -12321,9 +12460,9 @@
 msgctxt "gpx_field"
 msgid "Desc(ription)"
-msgstr ""
+msgstr "Описание"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr ""
+msgstr "Оба"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
@@ -12513,18 +12652,18 @@
 msgstr "По умолчанию (Автоопределение)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Использовать настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Позволить назначение пиктограмм по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Использованный стиль"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Стили отрисовки карты"
@@ -12873,28 +13012,20 @@
 msgstr "Невозможно активировать проекцию {0}. Используется Меркатор"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Идентификация личности"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Настройки прокси-сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Резервное копирование"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 "Задать ваши данные и определить способ идентификации личности на сервере OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Указать, используете ли вы прокси-сервер"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Указать, будете ли вы создавать резервные файлы"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -13011,6 +13142,15 @@
 "<br><br>Подробности (на англ.):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "Внешние инструменты"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13267,14 +13407,4 @@
 "идентификация\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Сохранять резервные копии"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"При сохранении, оставлять резервные копии файлов (в конце названия ставится "
-"~)"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13483,5 +13613,5 @@
 msgstr "Добавить новый тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13492,49 +13622,49 @@
 "display_values должно быть такое же, как и в values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Подробнее"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Неизвестный запрос: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Доступные роли"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "количество"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "элементы"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "Заготовка элемента роли без родителей"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "Заготовка вложенного элемента без родителей"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13544,15 +13674,15 @@
 msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13563,17 +13693,17 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Ничего не выделено!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Неудачный выбор!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Применить заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -14221,5 +14351,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14332,5 +14462,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14339,5 +14469,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14411,5 +14541,5 @@
 msgstr "Файл \"{0}\" не существует"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14421,10 +14551,10 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Найден элемент XML <nd>, не являющийся дочерним элементом для <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14432,5 +14562,5 @@
 msgstr "Отсутствует обязательный атрибут ''{0}'' на <nd> линии {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14438,5 +14568,5 @@
 msgstr "Неверное значение атрибута ''ref'' элемента <nd>. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14444,5 +14574,5 @@
 msgstr "Удалённая линия {0} содержит точки"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -14451,5 +14581,5 @@
 "<relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14457,5 +14587,5 @@
 msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14464,5 +14594,5 @@
 "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14470,5 +14600,5 @@
 msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14479,10 +14609,10 @@
 "{2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неполная спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14490,9 +14620,9 @@
 msgstr "Удалённое отношение {0} содержит дочерние элементы"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "В теге отсутствует ключ или значение атрибута."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14501,11 +14631,11 @@
 "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Недопустимый объект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14519,8 +14649,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14536,5 +14666,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14542,5 +14672,5 @@
 msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14549,6 +14679,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14562,6 +14692,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14570,5 +14700,5 @@
 msgstr "Неверное значение атрибута ''changeset''. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14576,5 +14706,5 @@
 msgstr "Отсутствует нужный атрибут ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14582,13 +14712,13 @@
 msgstr "Неверная длина значения атрибута ''{0}''. Получено ''{1}''."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14596,5 +14726,5 @@
 msgstr "Удалённая точка {0} это часть линии {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14606,5 +14736,5 @@
 "мере одна точка отсутствовала в данных, загруженных с сервера."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14616,5 +14746,5 @@
 "внешним id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14622,17 +14752,17 @@
 msgstr "Удалённый дочерний элемент {0} входит в отношение {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Разбор данных OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Подготовка набора данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15184,11 +15314,11 @@
 msgstr "Скачивание с сервера списка модулей..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Скачивание списка модулей с ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15199,16 +15329,16 @@
 "записать в кэш список модулей с сайта модулей ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Запись списка модулей в локальный кэш ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Разбор списка модулей с сайта ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15219,5 +15349,5 @@
 "Текст ошибки: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15238,13 +15368,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Ничего не делать"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Сообщить об ошибке"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15256,9 +15386,9 @@
 "пожалуйста, заявку на исправление ошибки (trac)."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Неожиданная ошибка"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -15268,5 +15398,5 @@
 "вы работаете на последней версии JOSM здесь:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -15276,5 +15406,5 @@
 "обнаруженной ошибке, воспользовавшись следующей ссылкой:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15286,5 +15416,5 @@
 "постарайтесь описать её как можно подробней."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -15294,9 +15424,9 @@
 "информацию ниже, по этой URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Текст уже скопирован в буфер обмена)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Вы столкнулись с ошибкой в JOSM"
@@ -15549,5 +15679,5 @@
 "<br><br>Сообщение об ошибке:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15609,5 +15739,5 @@
 msgstr "не задействовано"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15620,5 +15750,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15628,5 +15758,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15637,5 +15767,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Подсказка: Горячие клавиши можно назначить в настройках)"
@@ -15756,5 +15886,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Видимость"
@@ -15840,10 +15970,62 @@
 msgstr "Загрузка треков на сайт openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Часы работы"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Изменить параметры {0} объекта"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Выбрать"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Линия {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Инструмент: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Ошибка в фильтре"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "открыть"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -16021,59 +16203,60 @@
 msgstr "Выровнять линии"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"Невозможно выравнивать соединённые сегменты.\n"
-"Пожалуйста, выберите два сегмента, которые не имеют общих точек."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "Сообщение AlignWayS"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"Выравнивание может вынести точки за пределы мира.\n"
+"Ваше действие было отменено."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Я готов!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "Советы для AlignWays"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Режим выравнивания линии"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Выровнять сегмент линии"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Параметр ''{0}'' не должен быть пустым"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"Сегмент, который вы выравниваете, не может быть тем же самым, по которому "
+"выравниваете.\n"
+"Пожалуйста, выберите другой сегмент для выравнивания."
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
 msgstr "Сообщение AlignWayS"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"Выравнивание может вынести точки за пределы мира.\n"
-"Ваше действие было отменено."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Я готов!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "Советы для AlignWays"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "Режим выравнивания линии"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "Выровнять сегмент линии"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Параметр ''{0}'' не должен быть пустым"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"Сегмент, который вы выравниваете, не может быть тем же самым, по которому "
-"выравниваете.\n"
-"Пожалуйста, выберите другой сегмент для выравнивания."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -16231,28 +16414,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Выравнивание сегментов.</b> Нажмите <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Также вы можете найти команду в меню "
-"<b>инструменты</b>\n"
-" или можете назначить действие на <b>панель инструментов</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -16274,5 +16437,5 @@
 "\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "Больше не показывать"
@@ -16385,5 +16548,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Здания"
@@ -16574,5 +16737,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Использовать \"Tableau d''assemblage\""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16638,5 +16801,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -17079,8 +17242,4 @@
 msgstr "Восток"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Север"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -17202,6 +17361,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Пустой слой"
@@ -17335,14 +17494,15 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
 msgid "Download Along"
-msgstr ""
+msgstr "Скачать вдоль"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
 msgid "Please select 1 or more ways to download along"
 msgstr ""
+"Выделите одну или несколько линий, вдоль которых необходимо загрузить данные"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} промежуточных точек для загрузки."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
@@ -18596,5 +18756,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Общественный транспорт"
@@ -18638,48 +18798,53 @@
 msgstr "Треки"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Точки на дорогах"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "загрузить данные из API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "Импортированы данные с {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "создать новые объекты"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "изменить выделение"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "изменить область просмотра на экране"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr "прочитать версию протокола"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "подтверждать все действия удалённого управления вручную."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Модуль, позволяющий другим приложениям управлять JOSM"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Дистанционное управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Настройки модуля дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18691,21 +18856,21 @@
 "подключающихся к модулю."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Разрешённые действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Разрешить действие?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Подтверждение действия дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Модулем дистанционного управления было предложено создать новую точку."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18713,15 +18878,15 @@
 "следующей ссылке:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "модуль дистанционного управления получил запрос на загрузку данных из API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности запроса: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18946,58 +19111,58 @@
 msgstr "Удалить ненужные точки из области."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Быстрая карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Автомасштабирование"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Загрузить квадрат карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Показать данные квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Загрузить все квадраты карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Увеличить масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Уменьшить масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Привязаться к размеру квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Очистить кеш квадратов карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "изображение "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "Автомасштабирование"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "загружать квадраты карты автоматически"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Настройки модуля SlippyMap."
@@ -19286,13 +19451,12 @@
 msgstr "Ряд домов вдоль улицы"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Редактировать символы SeaMap"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr "Редактировать OpenSeaMap"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
-msgstr ""
+msgstr "Редактор морских объектов Seamark Editor"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20422,25 +20586,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
 msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "Продублированные точки смешанного типа"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
 msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "Продублированные точки дорог"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
 msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "Продублированные точки железных дорог"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
 msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "Продублированные точки водных путей"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
 msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "Продублированные точки границ"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
 msgid "Power duplicated nodes"
-msgstr ""
+msgstr "Продублированные точки объектов энергетики"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20479,5 +20643,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Мультиполигон"
@@ -20601,59 +20765,59 @@
 msgstr "Перекрытие линий"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "Проверка отношений:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Этот модуль проверяет отношения на наличие ошибок."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Неизвестный тип отношения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "Пустое отношение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<пусто>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "Отсутствует роль {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Проблема проверки роли"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "Номер роли {0} слишком маленький ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "Номер роли {0} слишком большой ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "Неверный тип участника роли {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "Неизвестная роль {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "Обнаружена пустая роль"
@@ -21145,144 +21309,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% трека GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Показывает текущее положение для видеофрагмента"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Импортировать видео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Синхронизировать видео с этим треком GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Удалить видео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "удаляет текущее видео из слоя"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "воспр/пауза"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "начинает/приостанавливает воспроизведение видео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr "отмотать n сек назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "лежачий полицейский"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Пожалуйста, введите индекс квадрата"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "вперёд"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr "промотать n сек вперёд"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "быстрее"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "воспроизводить быстрее"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "медленнее"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "воспроизводить медленнее"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "циклически"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr "зацикливать n сек возле текущей позиции"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Удерживать в центре"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "устанавливать пиктограмму видео автоматически"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Ступени через ограду"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr "Подзаголовок"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Показывает текущее положение для видеофрагмента"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Длительность промотки"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Задать продолжительность промотки"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "Промотать видео на x мсек"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Длина цикла"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Задать продолжительность цикла"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr "без деинтерлейзинга"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr "дейнтерлейзить используя дублирование строк"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr "деинтерлейзить используя линейную интерполяцию"
@@ -21302,7 +21462,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "несколько"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21409,12 +21568,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Выбор с учетом поиска"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Точки на дорогах"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -21431,9 +21588,9 @@
 msgstr "Выберите не разветвляющиеся последовательности линий"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Произошла ошибка."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Не в кеше"
@@ -21496,21 +21653,21 @@
 msgstr "Отрегулируйте положение выбранного слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Пожалуйста, выберите слой WMS для выравнивания"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Выбрать слой WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Начало выравнивания"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Нет слоя WMS для выравнивания."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Нет слоёв для выравнивания"
@@ -21521,5 +21678,5 @@
 msgstr "Скачать квадрат карты WMS из {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21530,5 +21687,5 @@
 "знак '&' или '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21538,10 +21695,10 @@
 "Пожалуйста, проверьте настройки параметров."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Предупреждение: Полная ссылка: ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21552,5 +21709,5 @@
 "Это может привести к ошибочным координатам."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21559,19 +21716,19 @@
 "искажена"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(деактивировано)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21586,17 +21743,17 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Да, выбрать изображения"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Ошибочная ссылка?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21605,33 +21762,33 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Загрузить заново ошибочные квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Сохранить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21639,25 +21796,50 @@
 "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Установить закладку WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Невозможно найти объект на карте."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
@@ -21726,10 +21908,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"Модуль дистанционного управления получил запрос на импортирование данных по "
-"следующей ссылке:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22155,5 +22334,5 @@
 #: build/trans_plugins.java:20
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "Загрузка данных OSM вдоль линии"
 
 #. Plugin Duplicate-Way
@@ -22251,16 +22430,21 @@
 "ручкой планшета, без перемещения мыши (основная Java-планшет проблема)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Отображает фоновый рисунок OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Импорт вопросов из OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22270,5 +22454,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22278,5 +22462,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22287,5 +22471,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22296,10 +22480,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22309,15 +22493,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Разрешить другим приложениям посылать команды в JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Модуль для отката пакетов правок"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22330,5 +22514,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22339,10 +22523,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Предоставляет возможности маршрутизации."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22354,5 +22538,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22363,15 +22547,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволяет добавлять метки/точки в текущей GPS позиции."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22384,10 +22568,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
@@ -22395,5 +22579,5 @@
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22405,5 +22589,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22414,5 +22598,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22423,10 +22607,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22438,5 +22622,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22449,5 +22633,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22458,20 +22642,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Выделить последовательность неветвящихся соединённых линий"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22483,5 +22667,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22525,4 +22709,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22555,10 +22740,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Дороги"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Улицы"
@@ -22569,5 +22754,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автомагистраль"
@@ -22576,5 +22761,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Свойства автомагистрали"
@@ -22611,10 +22796,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Обозначение"
@@ -22628,8 +22813,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Кол-во полос"
@@ -22648,13 +22833,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -22688,17 +22873,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -22735,17 +22920,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22779,17 +22964,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -22820,17 +23005,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Выемка"
@@ -22861,17 +23046,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Насыпь"
@@ -22879,5 +23064,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Съезд с автомагистрали"
@@ -22886,5 +23071,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Свойства съезда с автомагистрали"
@@ -22892,5 +23077,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Автострада"
@@ -22899,5 +23084,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Свойства автострады"
@@ -22907,6 +23092,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Автомагистраль"
@@ -22914,5 +23099,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Съезд с автострады"
@@ -22921,5 +23106,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Свойства съезда с автострады"
@@ -22932,5 +23117,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Основная"
@@ -22939,5 +23124,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Свойства основной дороги"
@@ -22945,10 +23130,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Съезд с основной"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Свойства съезда с основной дороги"
@@ -22960,5 +23145,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Вторичная"
@@ -22968,5 +23153,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Свойства вторичной дороги"
@@ -22974,5 +23159,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Третичная"
@@ -22982,5 +23167,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Свойства третичной дороги"
@@ -22992,5 +23177,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Не классифицировано"
@@ -23000,5 +23185,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Свойства неклассифицированной дороги"
@@ -23008,6 +23193,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Место для разъезда"
@@ -23030,15 +23215,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Ширина (метры)"
@@ -23050,5 +23235,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Местного значения"
@@ -23057,5 +23242,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Свойства местной улицы"
@@ -23075,12 +23260,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -23102,166 +23287,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "негрунтовая дорога"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "грунтовая дорога"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "асфальт"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "металл"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "древесина"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "дорожные_камни"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "мостовая"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "гравий"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "галька"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "сжато"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "экогазон"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "трава"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "песок"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "грунт"
@@ -23269,5 +23454,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Жилая улица"
@@ -23276,5 +23461,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Свойства жилой улицы"
@@ -23282,5 +23467,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Пешеходная"
@@ -23289,5 +23474,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Свойства пешеходной улицы"
@@ -23295,5 +23480,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Служебная"
@@ -23302,5 +23487,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Свойства служебного проезда"
@@ -23310,18 +23495,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Тип служебного проезда"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "проезд"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "подъездная дорожка"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "парковочный проезд"
@@ -23329,5 +23514,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Проезд на парковке"
@@ -23337,10 +23522,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Изменить автомобильный проезд"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип неизвестен)"
@@ -23349,5 +23534,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Свойства дороги неизвестного типа"
@@ -23355,14 +23540,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Строительство"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Свойства ремонтируемой дороги"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Перекрёсток"
@@ -23378,5 +23563,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "Круг"
@@ -23385,5 +23570,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Дорожные ограничения"
@@ -23392,15 +23577,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Правка дорожных ограничений"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Платная"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Тупик"
@@ -23408,5 +23593,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Доступ"
@@ -23432,4 +23617,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23437,4 +23623,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23510,236 +23702,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "по пропускам"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "разрешено владельцем"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "сельскохозяйственное"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "лесничество"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "доставка"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "нет"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Земли сельскохозяйственного назначения"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "да"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "осн. предназначение"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "по пропускам"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "резиденты"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "разрешено владельцем"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "сельскохозяйственное"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "лесничество"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "доставка"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "нет"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Земли сельскохозяйственного назначения"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "осн. предназначение"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "официальное"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Грузовик (до 3.5т)"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Грузовик (более 3.5т)"
@@ -23754,10 +23953,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Лошадь"
@@ -23773,10 +23972,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -23791,19 +23991,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Автомобиль"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Общественный транспорт"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорость (в км/ч)"
@@ -23811,20 +24011,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Макс. масса (в тоннах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Макс. высота (в метрах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Макс. ширина (в метрах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Макс. Длина (метры)"
@@ -23832,5 +24032,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Круг"
@@ -23841,5 +24041,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Свойства перекрёстка"
@@ -23859,10 +24059,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "автомагистраль"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "съезд с дороги"
@@ -23884,10 +24084,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "cъезд с автострады"
@@ -23909,10 +24109,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "главная дорога"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "съезд с основной дороги"
@@ -23934,5 +24134,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23947,9 +24147,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "дорога третьего порядка"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "неклассифицированная дорога"
@@ -23963,9 +24163,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "дорога местного значения"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "жилая улица"
@@ -24009,10 +24209,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "служебный проезд"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "автобусный рельс"
@@ -24042,5 +24242,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -24052,10 +24252,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Свойства моста"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Свойства тоннеля"
@@ -24063,10 +24263,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Линии"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Грунтовка"
@@ -24075,35 +24275,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Свойства грунтовки"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Дорожное покрытие"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "тип1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "тип2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "тип3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "тип4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "тип5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Шкала MTB"
@@ -24111,5 +24311,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Тропа"
@@ -24118,76 +24318,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Свойства тропы"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Шкала SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "горный_туризм"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "горный_туризм_по_разрешению"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "альпинизм"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "альпинизм_по_разрешению"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "сложный_альпинизм"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "превосходное"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "хорошее"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "средний"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "плохое"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "ужасное"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Инвалидные коляски"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Лыжи"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Снегоход"
@@ -24196,5 +24396,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Дорога для верховой езды"
@@ -24202,5 +24402,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Свойства дороги для верховой езды"
@@ -24208,5 +24408,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Велодорожка"
@@ -24224,11 +24424,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Свойства велодорожки"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Пешеходы"
@@ -24236,5 +24436,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Разделённые пешеходная и велодорожка"
@@ -24242,5 +24442,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Совмещённые пешеходная и велодорожка"
@@ -24248,5 +24448,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Пешеходная дорожка"
@@ -24255,5 +24455,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Свойства пешеходной дорожки"
@@ -24261,5 +24461,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Лестница"
@@ -24269,10 +24469,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Свойства лестницы"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Количество мест"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Магистральная развязка"
@@ -24280,15 +24486,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Свойства магистральной развязки"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Придорожный сервис"
@@ -24296,5 +24502,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Свойства придорожного сервиса"
@@ -24302,10 +24508,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -24334,36 +24541,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Оператор"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Восстановить"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Свойства ресторана"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Телефон экстренного вызова"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Светофор"
@@ -24373,5 +24601,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходного перехода"
@@ -24380,27 +24608,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "нерегулируемый"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "регулируемый"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "необозначенный"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Разрешён переезд на лошади"
@@ -24408,6 +24636,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Разрешён переезд на велосипеде"
@@ -24416,11 +24644,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Под наблюдением постового"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Название перехода (Великобритания)"
@@ -24428,30 +24656,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra (нерегулируемый)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelican (со светофором)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan (вело-пешеходный со светофором)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin (со светофором с кнопкой)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus (для верховой езды)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger (нерегулируемый вело-пешеходный)"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Стоп"
@@ -24459,67 +24687,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Пешеходный переход"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Свойства перекрёстка"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Имя типа (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Приспособление для ограничения скорости"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Редактировать приспособление для ограничения скорости"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "лежачий полицейский"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "шикана"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "сужение"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "лежачий полицейский с разрывами"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "широкий лежачий полицейский"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "стол"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Место разъезда"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Свойства места разъезда"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Мини-круг"
@@ -24530,14 +24696,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Направление"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "по часовой стрелке"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Пешеходный переход"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Свойства перекрёстка"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Имя типа (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Приспособление для ограничения скорости"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Редактировать приспособление для ограничения скорости"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "лежачий полицейский"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "шикана"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "сужение"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "лежачий полицейский с разрывами"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "широкий лежачий полицейский"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "стол"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Место разъезда"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Свойства места разъезда"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Разворотный круг"
@@ -24547,5 +24775,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Граница населённого пункта"
@@ -24553,15 +24781,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Свойства границы населённого пункта"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Второе название"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Камера-скоростемер"
@@ -24570,11 +24798,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Телефон экстренного вызова"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Уклон"
@@ -24582,5 +24805,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Крутой уклон"
@@ -24588,5 +24811,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Контейнер с песком (щебнем)"
@@ -24596,10 +24819,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Брод"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Свойства брода"
@@ -24607,5 +24830,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -24613,5 +24836,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "свойства перевала"
@@ -24620,10 +24843,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Высота над уровнем моря"
@@ -24631,5 +24854,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Преграды"
@@ -24637,5 +24860,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Столбик"
@@ -24643,5 +24866,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Свойства столбика"
@@ -24686,16 +24909,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Преграда для велосипедов"
@@ -24704,5 +24927,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Бетонный блок"
@@ -24710,5 +24933,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Лежачая решётка (против скота)"
@@ -24716,10 +24939,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Свойства лежачей решётки"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Проезд для автобусов"
@@ -24727,15 +24950,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Свойства шипов"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Пункт оплаты за проезд"
@@ -24743,5 +24966,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Свойства платного проезда"
@@ -24749,10 +24972,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Пограничный контроль"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Свойства пограничного контроля"
@@ -24761,5 +24984,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Живая изгородь"
@@ -24770,22 +24993,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Забор"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "забор"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "деревянный забор"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "проволочный забор"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Стена"
@@ -24793,5 +25016,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Городская стена"
@@ -24800,5 +25023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
@@ -24809,10 +25032,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "проход"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Свойства прохода"
@@ -24820,5 +25043,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "ворота / дверь"
@@ -24826,50 +25049,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Свойства ворот"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Свойства шлагбаума"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Проволочные ворота"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Свойства проволочных ворот"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Ворота, открываемые бампером"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Свойства ворот, открываемых бампером"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Узкая калитка"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Свойства узкой калитки"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Ступени через ограду"
@@ -24877,25 +25100,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Свойства ступеней серез ограду"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Турникет"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Свойства турникета"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Свойства двойных ворот"
@@ -24903,25 +25126,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Родник"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Свойства родника"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Дренажный канал"
@@ -24929,10 +25141,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Свойства дренажного канала"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Канава"
@@ -24940,10 +25152,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Свойства канавы"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Ручей"
@@ -24951,10 +25163,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Свойства ручья"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Канал"
@@ -24962,10 +25174,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Свойства канала"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Река"
@@ -24975,59 +25187,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Свойства реки"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Родник"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Свойства родника"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Водопад"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Свойства водопада"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Водосливной порог"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Свойства водосливного порога"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Дамба"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Свойства дамбы"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Сточный бассейн"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Свойства сточного бассейна"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Резервуар"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Править резервуар"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Крытый резервуар"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Свойства крытого резервуара"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Свойства водоёма"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Суша"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Свойства суши"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Сточный бассейн"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Свойства сточного бассейна"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Резервуар"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Править резервуар"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Крытый резервуар"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Свойства крытого резервуара"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Береговая линия"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Свойства береговой линии"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -25036,10 +25302,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Свойства берега реки"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Заболоченные земли"
@@ -25050,14 +25317,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Свойства заболоченных земель"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "лесное болото"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "торфяное болото"
@@ -25071,35 +25338,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "открытое болото"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "солёное болото"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "мангровые заросли"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Грязь"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Свойства грязи"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Пляж"
@@ -25107,20 +25374,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Свойства пляжа"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Бухта"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Свойства бухты"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Утёс"
@@ -25128,145 +25395,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Свойства утёса"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Береговая линия"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Свойства береговой линии"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Магазин"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Паромный причал"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Свойства паромного причала"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Автомобиль"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "ОткрытыеСлои"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "начальный"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "велосипедный"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Паромная переправа"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Свойства паромной переправы"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Лодочная мастерская"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Свойства лодочной мастерской"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Док"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Свойства дока"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Дамба"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Свойства дамбы"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Гидротехнические сооружения"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Пристань для яхт"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Свойства пристани для яхт"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Пирс"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Свойства пирса"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Водосливной порог"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Свойства водосливного порога"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Водопад"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Свойства водопада"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Место разворота"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Пристань для яхт"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Свойства пристани для яхт"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Пирс"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Свойства пирса"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Паромный причал"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Свойства паромного причала"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Слип"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -25276,16 +25614,38 @@
 msgstr "Свойства слипа"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Лодочная мастерская"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Свойства лодочной мастерской"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Док"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Свойства дока"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Рельсовый транспорт"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Железная дорога"
@@ -25293,5 +25653,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Свойства железной дороги"
@@ -25321,7 +25681,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Ширина колеи (в мм)"
@@ -25337,8 +25697,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Типы"
@@ -25352,29 +25712,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "депо"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "боковой путь"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "ответвление"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Электрифицированный"
@@ -25387,8 +25747,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "контактный провод"
@@ -25459,8 +25819,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25472,8 +25832,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Напряжение"
@@ -25486,8 +25846,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Частота (Гц)"
@@ -25500,23 +25860,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Свойства узкоколейки"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Монорельс"
@@ -25524,50 +25884,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Свойства монорельса"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Историческая железная дорога"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Свойства исторической железной дороги"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Свойства лёгкой железной дороги"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Метрополитен"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Свойства метрополитена"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Трамвайная линия"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Свойства трамвайной линии"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Автобусные рельсы"
@@ -25575,5 +25935,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Свойства автобусных рельс"
@@ -25582,10 +25942,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Неиспользуемые пути"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Свойства неиспользуемых путей"
@@ -25594,9 +25954,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Необязательные типы"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Разобранные пути"
@@ -25605,5 +25965,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Железнодорожный переезд"
@@ -25612,5 +25972,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Переход через рельсовые пути"
@@ -25620,5 +25980,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Тип перехода"
@@ -25626,5 +25986,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -25633,5 +25993,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Буферный упор"
@@ -25640,10 +26000,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Канатная дорога"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Кресельная"
@@ -25651,10 +26011,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Свойства кресельной дороги"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Бугельная"
@@ -25662,10 +26022,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Свойства бугельного подъёмника"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Фуникулер"
@@ -25673,10 +26033,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Свойства кабиночной канатной дороги"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Гондольная"
@@ -25684,10 +26044,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Свойства гондольной канатной дороги"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25696,5 +26057,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25702,5 +26063,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25709,5 +26070,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25715,5 +26076,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Заправочная станция"
@@ -25723,69 +26084,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Свойства заправочной станции"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "земля"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indipend."
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25802,34 +26186,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25837,37 +26222,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Часы работы"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25888,33 +26284,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25923,170 +26321,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Вт-Вс 08:00-15:00;Сб 08:00-12:00"
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "С киоском"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Небольшой магазин"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Киоск"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Виды топлива:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "дизельное"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "биодизель"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "дизельное синтетическое (GTL-технология)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "дизельное для тяжёлого транспорта"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "бензин АИ-91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "бензин АИ-95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "бензин АИ-98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "бензин АИ-100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% смесь этанола)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% смесь этанола)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан (АГЗС)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "природный газ"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr "топливная смесь 1/25 (для мопедов)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "топливная смесь 1/50 (для мопедов)"
@@ -26094,4 +26514,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -26103,6 +26524,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Стоянка"
@@ -26111,5 +26532,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Свойства стоянки"
@@ -26120,25 +26541,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Справочный номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "наземная"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Перехватывающая парковка"
@@ -26147,54 +26570,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Денежный сбор"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Вместимость (общая)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Места для женщин"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Места для родителей"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Смотри в Wiki другие категории вместимости capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Автомойка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Свойства автомойки"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Автомагазин"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Свойства автомагазина"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Автомастерская"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Свойства автомастерской"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Типы"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Свойства дерева"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Содержимое"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Номер телефона"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Номер факса"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Сайт"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Адрес электронной почты"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Прокат"
@@ -26203,10 +26770,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Свойства проката автомобилей"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Кратковременный прокат"
@@ -26214,28 +26780,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Свойсттва кратковременного проката автомобилей"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Свойства велосипедной стоянки"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Вместимость"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Мотоцикл"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Свойства автомагистрали"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Придорожный сервис"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Масштабирование"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "плохое"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Заготовки"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Одежда"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Свойства велосипедной стоянки"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Вместимость"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Веломагазин"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Свойства веломагазина"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Свойства велопроката"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -26245,5 +26870,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -26251,5 +26876,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "код UIC"
@@ -26257,5 +26882,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Остановочный пункт"
@@ -26263,5 +26888,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Свойства остановочного пункта"
@@ -26269,5 +26894,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -26276,5 +26901,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Свойства трамвайной остановки"
@@ -26282,5 +26907,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Платформа"
@@ -26289,5 +26914,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Свойства железнодорожной платформы"
@@ -26299,5 +26924,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Номер платформы (пути)"
@@ -26305,10 +26930,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Полигон"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -26317,10 +26942,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Свойства входа в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Инвалидное кресло"
@@ -26329,5 +26954,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Автобусная станция"
@@ -26336,5 +26961,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Свойства автобусной станции"
@@ -26342,5 +26967,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -26350,13 +26975,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Свойства автобусной остановки"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Навес"
@@ -26364,19 +26988,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Скамейка"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Тактильное мощение"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Свойства автобусной платформы"
@@ -26384,5 +27008,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Такси"
@@ -26390,5 +27014,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Свойства стоянки такси"
@@ -26396,10 +27020,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Аэропорт"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Территория аэропорта"
@@ -26407,5 +27031,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Свойства территории аэропорта"
@@ -26413,10 +27037,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "Код ИАТА"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "Код ИКАО"
@@ -26425,5 +27049,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Взлётно-посадочная полоса"
@@ -26431,5 +27055,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Свойства взлётно-посадочной полосы"
@@ -26437,5 +27061,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Рулёжная дорожка"
@@ -26443,5 +27067,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Свойства рулёжной дорожки"
@@ -26449,5 +27073,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Вертолётная площадка"
@@ -26455,5 +27079,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Свойства вертолётной площадки"
@@ -26463,5 +27087,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Перрон"
@@ -26471,5 +27095,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Ангар"
@@ -26480,6 +27104,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Бакен"
@@ -26489,5 +27113,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Ветроуказатель (флюгер)"
@@ -26496,5 +27120,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Терминал"
@@ -26502,5 +27126,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Свойства терминала"
@@ -26508,15 +27132,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Свойства терминала аэропорта"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Путешествия"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Проживание"
@@ -26528,5 +27152,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -26535,5 +27159,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Свойства гостиницы"
@@ -26546,8 +27170,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Звёзды"
@@ -26571,34 +27195,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr "Точка доступа в интернет"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr "беспроводная сеть"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr "проводной доступ в сеть"
@@ -26612,168 +27236,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "пассажирский терминал"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr "Бесплатный доступ в интернет"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "выделеный"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr "разделённый"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr "изолированный"
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Номер телефона"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr "Номер факса"
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr "Сайт"
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr "Адрес электронной почты"
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Мотель"
@@ -26781,20 +27310,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Свойства мотеля"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Гостевой дом"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Свойства гостевого дома"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Съёмный домик (шале)"
@@ -26802,10 +27331,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Свойства съёмного домика (шале)"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Общежитие / хостел"
@@ -26813,30 +27342,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Свойства общежития (хостела)"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Альпинистский домик"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Свойства альпинистского домика"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Стоянка фургонов"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Свойства стоянки фургонов"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Кемпинг"
@@ -26844,10 +27374,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Свойства кемпинга"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Общественное питание"
@@ -26858,5 +27388,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -26864,5 +27394,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Свойства ресторана"
@@ -26870,5 +27400,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26876,79 +27408,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "бутерброды"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "шашлык"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "французская"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "сэндвичи"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "суши"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr "Пивоварня"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Ресторан быстрого питания"
@@ -26956,18 +27488,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Свофства ресторана быстрого питания"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "рыба и чипсы"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "курятина"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr "Ресторанный дворик"
@@ -26975,10 +27507,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr "Редактировать ресторанный дворик"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Кафе"
@@ -26986,10 +27518,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Свойства кафе"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Пивная"
@@ -26997,20 +27534,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Свойства пивной"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Пивной сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Свойства пивного сада"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Бар"
@@ -27018,10 +27555,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Свойства бара"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -27029,25 +27566,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Свойства ночного клуба"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Свойства достопримечательности"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Музей"
@@ -27055,9 +27592,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Свойства музея"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -27066,9 +27603,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Свойства зоопарка"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Парк развлечений"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Свойства парка развлечений"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Произведения искусства"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Свойства произведений искусств"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Место с хорошим видом"
@@ -27076,50 +27634,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Свойства смотровой площадки"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Наблюдательная вышка"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Парк развлечений"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Свойства парка развлечений"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Произведения искусства"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Свойства произведений искусств"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Свойства навеса"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Очаг"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Место для пикника"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "свойства места для пикника"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Справочное бюро"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Тип карты"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "топографическая"
@@ -27157,5 +27716,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -27163,28 +27722,28 @@
 msgstr "карта улиц"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Показанная область"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "окрестность"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "город"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "регион"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Подробное описание"
@@ -27194,5 +27753,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Показаны маршруты:"
@@ -27200,5 +27759,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "пешие"
@@ -27206,6 +27765,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "велосипедные"
@@ -27213,5 +27772,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "для горного велосипеда"
@@ -27219,6 +27778,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "лыжные"
@@ -27226,5 +27785,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "конные"
@@ -27232,46 +27791,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "...другие возможные способы передвижения"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Содержимое указателя"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "объявления"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "животный мир"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Указатель направлений"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr "Флагшток"
@@ -27280,5 +27839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Информационная стойка"
@@ -27286,55 +27845,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Подробное описание"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Аудиогид"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Аудиогид через мобильный телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Номер телефона"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Другие справочные бюро"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Свойства навеса"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Очаг"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Место для пикника"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "свойства места для пикника"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Замок"
@@ -27343,19 +27881,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Свойства замка"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Развалины"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Свойства развалин"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Археологические раскопки"
@@ -27364,9 +27902,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Свойства археологических раскопок"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -27374,10 +27912,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Свойства поля битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Палеонтологические раскопки"
@@ -27385,5 +27923,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Свойства палеонтологических раскопок"
@@ -27391,15 +27929,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Свойства монумента"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Памятник"
@@ -27407,55 +27945,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Свойства памятника"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Свойства придорожного креста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Свойства придорожной святыни"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Пограничный камень"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Свойства пограничного камня"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Свойства аквапарка"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -27463,35 +28001,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Свойства игровой площадки"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Место для рыбалки"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Свойства места для рыбалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Спортивные сооружения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Свойства стадиона"
@@ -27505,6 +28043,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -27920,6 +28458,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27954,240 +28492,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "американский_футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "бочче"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "канадский_футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "гребля на каное / каяке"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "скалолазание"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "тренировочные сетки для крикета"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "конный спорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "гаэльский_футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "моторный спорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "лига_регби"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "объединение_регби"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "плавание"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Свойства спортивного центра"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Свойства спортивного поля"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Свойства трека"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Свойства поля для гольфа"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Поле для минигольфа"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Свойства поля для минигольфа"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Многоборье"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Править Многоборье"
@@ -28204,5 +28742,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -28229,23 +28766,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "вид"
@@ -28262,5 +28807,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -28287,211 +28831,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "трек"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Боулинг (10-кегельный)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Свойства боулинга"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Свойства атлетики"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Свойства стрельбы из лука"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Скалолазание"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Свойства скалолазания"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Гребля на каное / каяке"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Свойства гребли на каное / каяке"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Свойства велоспорта"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Свойства собачьих бегов"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Конный спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Править конный спорт"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Свойства гимнастики"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Мотоспорт"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Свойства моторных видов спорта"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Свойства фигурного катания"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Скейтбординг"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Свойства скейтбординга"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Свойства плавания"
@@ -28499,52 +29046,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Свойства лыжного спорта"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Тип лыжни"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "горные лыжи"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "беговые лыжи"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "снежный парк"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "начальный"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "сложный"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "очень сложный"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "фрирайд"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Стрельба"
@@ -28552,204 +29099,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Свойства стрельбы"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Футбол (европейский)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Свойства футбола"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Свойства австралийского футбола"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "Американский футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "Свойства Американского футбола"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "Канадский футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "Свойства Канадского футбола"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "Гаэльский футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "Свойства Гаэльского футбола"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "Лига регби"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr "Свойства лиги регби"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "Объединение регби"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "Свойства объединения регби"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Свойства гольфа"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Бочче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Свойства бочче"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Свойства боулз"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Свойства крикета"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Тренировочные сетки для крикета"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Свойства тренировочных сеток для крикет"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Свойства крокета"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Свойства хокея"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Свойства пелоты"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Свойства ракетбола"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Свойства настольного тенниса"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Свойства тенниса"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Мотоспорт"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Свойства моторных видов спорта"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Предупреждение"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Свойства стоянки"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Автомобили"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Свойства моторных видов спорта"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Свойства фигурного катания"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Свойства пограничного контроля"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Автомобиль"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Свойства кабиночной канатной дороги"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Рукотворное"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Здание"
@@ -28757,5 +29370,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -28763,10 +29376,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Свойства общественного здания"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -28774,10 +29387,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Свойства муниципалитета"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Посольство"
@@ -28785,10 +29398,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Свойства посольства"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Суд"
@@ -28797,10 +29410,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Свойства суда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Тюрьма"
@@ -28809,10 +29422,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Свойства тюрьмы"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Полиция / милиция"
@@ -28822,10 +29435,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "свойства полиции / милиции"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -28834,10 +29447,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Свойства пожарного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -28845,5 +29458,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Свойства почтамта"
@@ -28851,15 +29464,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Свойства детского сада"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Школа"
@@ -28867,10 +29480,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Свойства школы"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Вуз"
@@ -28878,10 +29491,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Свойства вуза"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Профессиональное училище"
@@ -28889,5 +29502,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Свойства профессионального училища"
@@ -28895,5 +29508,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -28902,10 +29515,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Свойства кинотеатра"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Библиотека"
@@ -28914,9 +29527,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Свойства библиотеки"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -28924,10 +29537,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Свойства центра искусств"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Театр"
@@ -28936,10 +29549,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Свойства театра"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Культовое место"
@@ -28949,5 +29562,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Свойства культового места"
@@ -28956,6 +29569,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Религия"
@@ -28964,66 +29577,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "бахаи"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "христианство"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "индуизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "джайнизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "иудаизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "ислам"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "спиритуализм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "унитарианство"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Конфессия"
@@ -29032,189 +29645,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "англиканская"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "баптисты"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "католики"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "евангелисты"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "свидетели иеговы"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "лютеране"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "методисты"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "мормоны"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "православные"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "пятидесятники"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "пресвитериане"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "протестанты"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "квакеры"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "шииты"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "сунниты"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Адреса"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Правка адресов"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Номер дома"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Название дома"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Улица"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Город"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Почтовый индекс"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Код страны"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Править интерполяцию адресов"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Схема нумерации"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "нечётные"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "чётные"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "алфавитный"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Цеха"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Свойства цехов"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Башня"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Свойства башни"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Назначение башни"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "связная"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "наблюдательная"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Высота (в метрах)"
@@ -29222,25 +29765,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Свойства водонапорной башни"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Свойства газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -29248,10 +29791,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Свойства маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -29259,10 +29802,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Свойства ветряной мельницы"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -29271,41 +29814,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Свойства трубопровода"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "теплотрасса"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "нефть"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "канализация"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "любого назначения"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Расположение"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "подводная"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "надземная"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -29315,10 +29858,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Свойства чистных сооружений"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Кран"
@@ -29326,5 +29869,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Свойства крана"
@@ -29332,10 +29875,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Свойства бакена"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Геодезический пункт"
@@ -29343,10 +29886,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Свойства геодезического пункта"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Камера наблюдения"
@@ -29354,23 +29897,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Свойства камеры наблюдения"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "внутренняя"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "внешняя"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "общедоступное"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -29380,35 +29923,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Свойства электростанции"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "ветряная"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "гидро"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "тепловая"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "атомная"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "угольная"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "солнечная"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -29417,10 +29960,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Свойства электроподстанции"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -29429,5 +29972,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Свойства трансформаторной будки"
@@ -29435,10 +29978,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Табличка на линии электропередач"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -29449,23 +29992,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Свойства опоры ЛЭП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "вышка"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "столб"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Номер вышки"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -29474,20 +30017,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Свойства линии электропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Тип линии"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr "высоковольтная"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29495,55 +30038,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Количество токонесущих кабелей (без грозозащитных)"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "один провод"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "два провода"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "три провода"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "четыре провода"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "ограничено"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Телефон"
@@ -29552,5 +30095,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Свойства телефона"
@@ -29558,5 +30101,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Монеты"
@@ -29564,5 +30107,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Банкноты"
@@ -29570,5 +30113,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -29576,5 +30119,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Дебетные карты"
@@ -29582,15 +30125,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Пункт приёма утильсырья"
@@ -29599,5 +30142,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Свойства пункта приёма утильсырья"
@@ -29605,35 +30148,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Консервные банки"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Одежда"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Урна для мусора"
@@ -29641,5 +30179,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Свойства урны для мусора"
@@ -29648,31 +30186,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "камень"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "чёрный"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "коричневый"
@@ -29751,5 +30289,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29759,31 +30297,31 @@
 msgstr "зелёный"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "красный"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "синий"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "серый"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "белый"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Количество мест"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Охотничья вышка"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Свойства охотничьей вышки"
@@ -29791,31 +30329,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "низкая"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "половинная"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "полная"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Скрытая"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Запирается"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29824,10 +30362,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Свойства фонтана"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -29836,10 +30374,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Свойства питьевой воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Пожарный кран"
@@ -29848,5 +30386,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Свойства пожарного крана"
@@ -29854,501 +30392,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Пешком"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Супермаркет"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Свойства супермаркета"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Небольшой магазин"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Свойства магазина шаговой доступности"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Киоск"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Свойства киоска"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Мясная лавка"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Свойства мясной лавки"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Булочная"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Свойства булочной"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Натуральные продукты"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Свойства магазина натуральных продуктов"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Алкогольная продукция"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Свойства магазина алкогольной продукции"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Напитки"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Свойства магазина напитков"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Магазины, служба быта"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Бытовая химия"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Свойства магазина бытовой химии"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Парикмахерская"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Свойства парикмахерской"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Оптика"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Свойства магазина оптики"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Свойства компьютерного магазина"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Обувь"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Свойство обувного магазина"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Товары для активного отдыха"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Свойства магазина товаров для активного отдыха"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Свойства спортивного магазина"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Химчистка"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Свойства химчистки"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Прачечная"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Свойства прачечной"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "жд дорога сверху"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Свойства железной дороги"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Компьютеры"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Свойства компьютерного магазина"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Бытовая электроника"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Свойства магазина бытовой электроники"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Звуковая аппаратура"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Свойства магазина звуковой аппаратуры"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Видео"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Свойства магазина видео"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Цветочный магазин"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Свойства цветочного магазина"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Садово-огородный магазин"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Свойства садово-огородного магазина"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Хозяйственный магазин"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Свойства хозяйственного магазина"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Магазин \"Сделай сам\""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Свойства магазина \"Сделай сам\""
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Мебель"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Свойства мебельного магазина"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Канцтовары"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Свойства магазина канцтоваров"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Книжный магазин"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Свойства книжного магазина"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Туристическое агенство"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Свойства туристического агентства"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Игрушки"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Свойства магазина игрушек"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Торговый автомат"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Свойства торгового автомата"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Реализуемая продукция"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "билеты на общественный транспорт"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "схемы общественного транспорта"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "талоны на парковку"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "продукты питания"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "напитки"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "сладости"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "сигареты"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "фотографии"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "еда для животных"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "газеты"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "игрушки"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "марки"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-карты"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "телефонные карты"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "ваучеры"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "велосипедная шина"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "презервативы"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "тампоны"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "пакеты для экскрементов"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "накопительные, дисконтные карты"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Финансы"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Банк"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Свойства банка"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Банкомат"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Обмен валют"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Свойства пункта обмена валют"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Свойства банкомата"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Здравоохранение"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Врач"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Свойства врача"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Стоматология"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Свойства стоматологии"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Аптека"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Свойства аптеки"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Отпуск лекарств по рецептам"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Больница"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Свойства больницы"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Детский дом"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Свойства детского дома"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Магазины, служба быта"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Автомагазин"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Свойства автомагазина"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Веломагазин"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Свойства веломагазина"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Супермаркет"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Свойства супермаркета"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Бытовая химия"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Свойства магазина бытовой химии"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Небольшой магазин"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Свойства магазина шаговой доступности"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Киоск"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Свойства киоска"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Книжный магазин"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Свойства книжного магазина"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Туристическое агенство"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Свойства туристического агентства"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Мясная лавка"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Свойства мясной лавки"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Булочная"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Свойства булочной"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Цветочный магазин"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Свойства цветочного магазина"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Натуральные продукты"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Свойства магазина натуральных продуктов"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Алкогольная продукция"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Свойства магазина алкогольной продукции"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Напитки"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Свойства магазина напитков"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Компьютеры"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Свойства компьютерного магазина"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Бытовая электроника"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Свойства магазина бытовой электроники"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Звуковая аппаратура"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Свойства магазина звуковой аппаратуры"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Мебель"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Свойства мебельного магазина"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Садово-огородный магазин"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Свойства садово-огородного магазина"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Хозяйственный магазин"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Свойства хозяйственного магазина"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Магазин \"Сделай сам\""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Свойства магазина \"Сделай сам\""
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Канцтовары"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Свойства магазина канцтоваров"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Парикмахерская"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Свойства парикмахерской"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Обувь"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Свойство обувного магазина"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Игрушки"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Свойства магазина игрушек"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Видео"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Свойства магазина видео"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Химчистка"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Свойства химчистки"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Прачечная"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Свойства прачечной"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Товары для активного отдыха"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Свойства магазина товаров для активного отдыха"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Свойства спортивного магазина"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Оптика"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Свойства магазина оптики"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Торговый автомат"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Свойства торгового автомата"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Реализуемая продукция"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "билеты на общественный транспорт"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "схемы общественного транспорта"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "талоны на парковку"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "продукты питания"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "напитки"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "сладости"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "сигареты"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "фотографии"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "еда для животных"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "газеты"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "игрушки"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "марки"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-карты"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "телефонные карты"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "ваучеры"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "велосипедная шина"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "презервативы"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "тампоны"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "пакеты для экскрементов"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "накопительные, дисконтные карты"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Финансы"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Банк"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Свойства банка"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Банкомат"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Обмен валют"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Свойства пункта обмена валют"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Свойства банкомата"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Здравоохранение"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Врач"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Свойства врача"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Стоматология"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Свойства стоматологии"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Аптека"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Свойства аптеки"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Отпуск лекарств по рецептам"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Больница"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Свойства больницы"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Пункт экстренного вызова"
@@ -30357,5 +30897,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Свойства пункта скорой помощи"
@@ -30364,15 +30904,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, например: +7-916-0857403)"
@@ -30380,5 +30920,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Ветеринария"
@@ -30387,368 +30927,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Свойства ветеринарии"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Границы"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Государственная"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Свойства государственной границы"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Административная"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Свойства административной границы"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Гражданская"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Свойства политико-административной границы"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Политическая"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Свойства политической границы"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Национальный парк"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Свойства национального парка"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Места"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Континент"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Свойства континента"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Страна"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Свойства страны"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Штат"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Свойства штата"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Область"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Свойства области"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Округ"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Свойства округа"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Город (более 100 000)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Свойства большого города"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Город (до 100 000)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Свойствао малого города / посёлка"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Пригород"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Свойства пригорода"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Село"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Свойства села"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Деревня"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Свойства деревни"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Местность"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Свойства местности"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Вершина"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Свойства вершины"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Ледник"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Свойства ледника"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Вулкан"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Свойства вулкана"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Вход в пещеру"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Свойства входа в пещеру"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Остров"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Свойства острова"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Островок"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Свойства островка"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "природа"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Дерево"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Свойства дерева"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Научное название"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Лес"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Свойства леса"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "Хвойный"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "Лиственный"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "Смешанный"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Лесопосадки"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Свойства лесопосадок"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Заповедник"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Свойства заповедника"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Вход в пещеру"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Свойства входа в пещеру"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Вершина"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Свойства вершины"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Ледник"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Свойства ледника"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Вулкан"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Свойства вулкана"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Границы"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Государственная"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Свойства государственной границы"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Административная"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Свойства административной границы"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Гражданская"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Свойства политико-административной границы"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Политическая"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Свойства политической границы"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Национальный парк"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Свойства национального парка"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Каменистая осыпь"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Свойства каменистой осыпи"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Каменистая пустошь"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Свойства каменистой пустоши"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Заросли кустарника"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Свойства зарослей кустарника"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Пустырь"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Свойства пустыря"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Дерево"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Свойства дерева"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Научное название"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Лес"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Свойства леса"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "Хвойный"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "Лиственный"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "Смешанный"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Лесопосадки"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Свойства лесопосадок"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Заповедник"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Свойства заповедника"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Каменистая осыпь"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Свойства каменистой осыпи"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Заросли кустарника"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Свойства зарослей кустарника"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Каменистая пустошь"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Свойства каменистой пустоши"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Пустырь"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Свойства пустыря"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -30757,45 +31303,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Свойства двора фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Сельскохозяйственные угодья"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Свойства сельскохозяйственных угодий"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Сенокосный луг"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Свойства сенокосного луга"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Виноградники"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Свойства виноградников"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Огородные участки"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Свойства огородных участков"
@@ -30803,25 +31349,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Сады"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Свойства садов"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Свойства газона"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Площадка для праздников"
@@ -30829,10 +31375,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Свойства площадки для праздников"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Общественные земли"
@@ -30840,20 +31386,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Свойства общественных земель"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Свойства парка"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Игровая площадка"
@@ -30861,5 +31407,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Свойства игровой площадки"
@@ -30867,15 +31413,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Свойства жилой зоны"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Погост"
@@ -30883,9 +31429,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Свойства погоста"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -30893,39 +31439,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Свойства кладбища"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Свойства зоны розничной торговли"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Деловая территория"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Свойства деловой территории"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Промышленная территория"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Свойства промышленной территории"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Территория железной дороги"
@@ -30933,15 +31479,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Свойства территории железной дороги"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Военная зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Свойства военной зоны"
@@ -30949,52 +31495,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Строительная площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Свойства стройплощадки"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Расчистка застройки"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Свойства расчистки застройки"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Зона под застройку"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Свойства зоны под застройку"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Свойства свалки"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Свойства карьера"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Станция"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Адреса"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Правка адресов"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Номер дома"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Название дома"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Улица"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Город"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Почтовый индекс"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Код страны"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "Код ИАТА"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "В"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "Код ИАТА"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "Ю"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Править интерполяцию адресов"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Схема нумерации"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "нечётные"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "чётные"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "алфавитный"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Содержимое"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Добавить информацию об авторе"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Изображение"
 
 #. item "Relations/Multipolygon"
@@ -31002,5 +31681,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигон"
@@ -31012,5 +31691,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "внешний сегмент"
@@ -31018,5 +31697,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -31024,5 +31703,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Граница"
@@ -31033,5 +31712,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Свойства границы"
@@ -31039,36 +31718,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Тип границы"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "административная"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "национальная"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "общины"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "политическая"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Административный уровень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Подчиненная территория"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Административный центр"
@@ -31076,5 +31755,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -31083,5 +31762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Свойства ограничения на поворот"
@@ -31089,34 +31768,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "только направо"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "только налево"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "только прямо"
@@ -31125,15 +31804,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "с линии"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "на линию"
@@ -31141,5 +31820,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Маршрут"
@@ -31148,5 +31827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Свойства маршрута"
@@ -31154,132 +31833,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Тип маршрута"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "велосипедный"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "лыжный"
@@ -31347,5 +31915,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31355,9 +31923,9 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "объездной"
@@ -31371,10 +31939,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "линия метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Описание знака"
@@ -31382,31 +31950,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -31415,30 +31983,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -35417,7 +35985,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Подложка Landsat"
+msgstr "Landsat (зеркало)"
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35539,8 +36106,48 @@
 msgstr "Sicily - Италия"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 — Италия"
+
+#~ msgid "Keep backup files"
+#~ msgstr "Сохранять резервные копии"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "Невозможно выравнивать соединённые сегменты.\n"
+#~ "Пожалуйста, выберите два сегмента, которые не имеют общих точек."
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Выравнивание сегментов.</b> Нажмите <b><i><span style=\"color:"
+#~ "green\">Shift-A</span></i></b>. Также вы можете найти команду в меню "
+#~ "<b>инструменты</b>\n"
+#~ " или можете назначить действие на <b>панель инструментов</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Гидротехнические сооружения"
 
 #~ msgid "No data imported."
@@ -35682,7 +36289,4 @@
 #~ msgid "Time entered could not be parsed."
 #~ msgstr "Введённое время невозможно использовать"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 22859)
+++ applications/editors/josm/i18n/po/sk.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-08-14 00:18+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:14+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Upozornenie"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -410,4 +410,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -425,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1048,5 +1049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1066,5 +1067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1471,13 +1472,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1486,5 +1487,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1492,9 +1493,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1502,5 +1503,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1534,8 +1535,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1544,9 +1545,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1562,6 +1563,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1571,5 +1572,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1594,6 +1595,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Chyba"
@@ -1756,5 +1757,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Nie, zrušiť"
@@ -2050,5 +2051,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2543,5 +2544,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2585,9 +2586,9 @@
 "Skutočne ich chcete presunúť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2595,9 +2596,9 @@
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2878,5 +2879,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Hľadať"
@@ -3079,7 +3080,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3355,5 +3356,5 @@
 msgstr[2] "Posun {0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3514,31 +3515,31 @@
 msgstr "Automatická úprava značiek (tag)"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3557,15 +3558,15 @@
 msgstr "Chybná hodnota zemepisnej dĺžky ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Poškodený konfiguračný súbor pri linke {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3576,5 +3577,5 @@
 "nie je adresár."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3585,5 +3586,5 @@
 "nie je adresár.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3594,5 +3595,5 @@
 "chýbajúceho adresára preferencií: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3603,5 +3604,5 @@
 "chýbajúceho adresára preferencií: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3611,5 +3612,5 @@
 "súboru preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3620,5 +3621,5 @@
 "súborom preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3629,5 +3630,5 @@
 "preferencií do východzieho: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3638,5 +3639,5 @@
 "súboru  <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3647,10 +3648,10 @@
 "preferencií do východzích: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3778,5 +3779,5 @@
 msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3853,9 +3854,9 @@
 "zmenového súboru je {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 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:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3865,5 +3866,5 @@
 "ostatné nie sú"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4060,15 +4061,34 @@
 msgstr "PUWG 2000 Zone {0} (Poľsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Švajčiarsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM Zone"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Sever"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "juh"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Skok tam"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4092,9 +4112,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4137,5 +4157,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "železnica"
@@ -4156,5 +4176,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4413,70 +4433,70 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Sťahovanie polohy na url (so lat=x&lon=y&zoom=z) ako raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Nastaviť jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Zmena adresára  pre všetký nastavenia užívateľa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4490,9 +4510,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4502,57 +4522,67 @@
 "poriadku."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "Uistite sa, že ste načítali nejaké dáta ak ste použili --výber."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Prebieha inicializácia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Aktualizujem pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Inštalujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debetné karty"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4562,9 +4592,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4578,9 +4608,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4704,23 +4735,23 @@
 msgstr "Používateľ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí byť v  zozname vrstiev"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4818,5 +4849,5 @@
 msgstr "Kliknutie zavrie dialóg a zruší vymazanie objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4826,17 +4857,17 @@
 "zväčšenia.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Úroveň zväčšenia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "z dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "až do dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4850,25 +4881,25 @@
 "platné.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Adresa dlaždice:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Použiť adresu dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Prosím vložte adresu dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Aktuálna hodnota nie je platnou adresou dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Prosím vložte index dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5296,4 +5327,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5377,4 +5409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5391,4 +5424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5462,5 +5496,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5472,10 +5506,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "žiadny"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "všetky"
@@ -5558,5 +5592,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5569,5 +5603,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5603,17 +5637,17 @@
 msgstr "Ešte nerozhodnuté"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Funkcia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Vložiť funkcie pre všetkých členov relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Tagom zmenená relácia s "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5623,15 +5657,15 @@
 "zmenených relácií.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Kláves:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr "<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5639,5 +5673,5 @@
 msgstr "Hodnota:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5646,5 +5680,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5662,5 +5696,5 @@
 "spojená cesta zaujme miesto po pôvodnej ceste v relácii.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5678,5 +5712,5 @@
 "výsledný bod zaujme miesto po pôvodnom bode v relácii.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Použiť túto funkciu pre všetkých členov"
@@ -5828,5 +5862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5946,5 +5980,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5952,5 +5986,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5958,5 +5992,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5964,5 +5998,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5970,5 +6004,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5977,5 +6011,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5983,5 +6017,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5989,5 +6023,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5995,24 +6029,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Aktívny filter</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> skryté objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> vypnuté objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6034,5 +6068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6057,37 +6091,37 @@
 msgstr "Rozšírené info objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Zadajte súradnice nového bodu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Použite desatinné stupne."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Prosím vložte platnú zemepisnú šírku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Prosím vložte platnú zemepisnú dĺžku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Prosím vložte zemepisnú dĺžku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Zatvorte dialóg a vytvorte nový bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Zatvorte dialóg, nevytvorte nový bod"
@@ -6143,9 +6177,9 @@
 msgstr "Informácie o vrstve"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relácie"
@@ -6193,10 +6227,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Stiahnuť neúplných členov vybratých relácií"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Stiahnuť neúplných členov"
@@ -6216,37 +6250,37 @@
 msgstr "Otvoriť výber obsahu okien."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Vyhľadávanie pre objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Priblížiť na výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Priblížiť na vybraté elementy(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Otvoriť editor relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Otvoriť editor relácií pre vybratú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Vybrať v obsahu relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Vybrať reláciu v obsahu relácií."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6255,27 +6289,27 @@
 msgstr "Výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Výber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Získať podrobné informácie o vnútornom stave objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Prezrieť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Uvoľniť panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6284,5 +6318,5 @@
 "lište."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu"
@@ -6577,13 +6611,13 @@
 msgstr "Nič nie je na zväčšenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Obsah tohto zmenového súboru nie je ešte stiahnutý."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Stiahnuť teraz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Stiahnuť obsah zmenového súboru"
@@ -6695,4 +6729,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6711,6 +6749,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6728,8 +6764,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6740,4 +6783,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6752,33 +6801,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6802,12 +6840,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6879,10 +6927,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6912,8 +6964,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6976,6 +7024,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7028,4 +7074,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7090,32 +7148,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7124,6 +7190,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7132,24 +7200,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7164,82 +7222,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7320,155 +7378,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Názov"
@@ -7938,4 +8001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<rôzne>"
@@ -8474,17 +8538,17 @@
 msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "zahrňujúci priame deti rodičovských(nadriadených) relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Načítať rodičovské(nadriadené) relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Nahrávam rodičovskú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Načítať aktuálne vybranú reláciu"
@@ -8773,4 +8837,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8778,15 +8843,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Typ"
@@ -8805,16 +8870,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "neznámy"
@@ -9439,5 +9504,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
@@ -9696,20 +9761,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Vrstva"
@@ -10213,11 +10278,6 @@
 msgstr[2] "{0} zmazaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr "gps poloha bodu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10225,5 +10285,6 @@
 msgstr "Meno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10231,5 +10292,5 @@
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -10240,23 +10301,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
 msgstr "Dĺžka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -10266,5 +10330,6 @@
 msgstr[2] "{0} trás, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
@@ -10274,10 +10339,24 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr "gps poloha bodu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} stopa(track)"
+msgstr[1] "{0} stopy(track)"
+msgstr[2] "{0} stôp(track)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10287,10 +10366,10 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10301,7 +10380,7 @@
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10309,10 +10388,10 @@
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10320,10 +10399,10 @@
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10331,21 +10410,21 @@
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Stiahnuť okolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "iba stopy(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "iba waypointy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "stopy a waypointy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10357,9 +10436,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10369,5 +10448,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10377,30 +10456,30 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10408,5 +10487,5 @@
 msgstr "Prispôsobiť farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10415,5 +10494,5 @@
 msgstr "Predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10422,18 +10501,18 @@
 msgstr "Zvoľte farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Značky z pomenovaných bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pomenovanie trackpoints od {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importovať zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10445,23 +10524,23 @@
 "cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Import nie je možný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosúbory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Zukové značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importovať obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10927,15 +11006,15 @@
 msgstr "Súbor s obrázkom nemôže byť zmazaný."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Bez obrázka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Nahrávam {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11987,4 +12066,48 @@
 msgid "Voice recorder calibration"
 msgstr "Kalibrácia zvukového nahrávania"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Aktualizovať v intervale (v dňoch):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Východzia hodnota je''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Pri ukladaní zanechávať záložné súbory končiace znakom ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Zálohovať súbor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Nastaviť či vytvoriť záložný súbor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12068,5 +12191,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Vozidlo"
@@ -12085,16 +12208,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bicykel"
@@ -12128,12 +12251,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Pešo"
@@ -12395,18 +12518,18 @@
 msgstr "Štandardný (Automatická predvoľba)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Povoliť vstavané východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Povoliť built-in icon východzí"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Použitý štýl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
@@ -12751,27 +12874,19 @@
 msgstr "Projekcia {0} nemohla byť aktivovaná. Bude použitá projecia Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Overenie totožnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Nastavenia proxy servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Zálohovať súbor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "Nastaviť vašu totožnosť a spôsob overovania na OSM servery"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Nastaviť či používate proxy server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Nastaviť či vytvoriť záložný súbor"
 
 #. 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
@@ -12888,6 +13003,15 @@
 "(nepreložené):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "náhradný"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13127,12 +13251,4 @@
 "Použitím overovacej metódy ''Základné overenie totožnosti''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Ponechávať záložné súbory"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Pri ukladaní zanechávať záložné súbory končiace znakom ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13336,5 +13452,5 @@
 msgstr "Pridať novú značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13345,49 +13461,49 @@
 "byť rovnaký ako v hodnotách"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Viac informácii o tejto vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Dostupné úlohy"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "úlohy"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "počet"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "prvky"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Voliteľné atribúty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13397,15 +13513,15 @@
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13416,17 +13532,17 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -14070,5 +14186,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14180,5 +14296,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14187,5 +14303,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14257,5 +14373,5 @@
 msgstr "Súbor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14267,5 +14383,5 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
@@ -14273,5 +14389,5 @@
 "vytvoriť XML element <nd> element nie je ako priame dieťa z elementu <way>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14279,5 +14395,5 @@
 msgstr "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14285,5 +14401,5 @@
 msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14291,5 +14407,5 @@
 msgstr "Vymazaná cesta {0} obsahuje body"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -14297,5 +14413,5 @@
 "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu <relácia>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14303,5 +14419,5 @@
 msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14310,5 +14426,5 @@
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14316,5 +14432,5 @@
 msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14324,10 +14440,10 @@
 "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletné <member> špecifikácie s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14335,9 +14451,9 @@
 msgstr "Zmazaná relácia {0} obsahuje členy"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "Chýbajúce kľúče alebo hodnoty atribútu v tagu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14345,11 +14461,11 @@
 msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14362,8 +14478,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14379,5 +14495,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14385,5 +14501,5 @@
 msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14392,6 +14508,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14405,6 +14521,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14413,5 +14529,5 @@
 msgstr "Chybné hodnoty atributu ''changeset''. Mám {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14419,5 +14535,5 @@
 msgstr "Chýba povinná vlastnosť ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14425,13 +14541,13 @@
 msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14439,5 +14555,5 @@
 msgstr "Vymazaný bod {0} je súčasťou cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14449,5 +14565,5 @@
 "chýbal v nahratých dátach."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14459,5 +14575,5 @@
 "''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14465,17 +14581,17 @@
 msgstr "Vymazaný člen {0} je použitý v relácii {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Rozložiť OSM dáta..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Pripravujem dátový súbor ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15028,11 +15144,11 @@
 msgstr "Stiahujem zoznam pluginov ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Sťahovanie zoznamu pluginov z ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15043,16 +15159,16 @@
 "obsah pluginu z webu pluginu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Zapisujem obsah pluginu do miestnej cache ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Rozkladanie obsahu pluginu z webu ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15063,5 +15179,5 @@
 "Vynechávam. Výnimka bola: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15082,13 +15198,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Neurobiť nič"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Nahlásiť chybu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15100,9 +15216,9 @@
 "chybe."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Neočakávaná chyba programu."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -15112,5 +15228,5 @@
 "sa, že máte program JOSM aktualizovaný na poslednú verziu  tu:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -15121,5 +15237,5 @@
 "odkazu:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15131,5 +15247,5 @@
 "podrobne, ako je to možné."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -15139,9 +15255,9 @@
 "URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Text už bol skopírovaný do schránky.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Narazili ste na chybu v programe JOSM"
@@ -15396,5 +15512,5 @@
 "<br><br>Chybová správa je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15456,5 +15572,5 @@
 msgstr "nepoužité"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15467,5 +15583,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15475,5 +15591,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15484,5 +15600,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Pomoc: Skratky môžeš modifikovať v nastaveniach)"
@@ -15599,5 +15715,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Viditeľnosť"
@@ -15683,10 +15799,61 @@
 msgstr "Nahrať Stopy (Traces) na openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Otváracia doba"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Zmeniť vlastnosti až {0} objektu."
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Vybrať"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Cesta {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Nástroj: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "otvoriť"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -15859,51 +16026,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Nemôžem pridať body ležiace mimo svet."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Som pripravený!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parameter ''{0}'' nesmie byť nulový"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Som pripravený!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parameter ''{0}'' nesmie byť nulový"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -16002,16 +16171,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -16025,5 +16186,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -16136,5 +16297,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Budovy, stavby"
@@ -16388,5 +16549,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16830,8 +16991,4 @@
 msgstr "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Sever"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16954,6 +17111,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Prázdna vrstva"
@@ -18338,5 +18495,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Hromadná doprava"
@@ -18380,48 +18537,53 @@
 msgstr "Stopy"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Cestné objekty"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "nahrať dáta z API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "importované dáta z {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "vytvoriť nové objekty"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "zmena výberu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "zmena pohľadu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrdzovať všetky požiadavky Vzdialenej kontroly ručne"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňujúci ovládanie JOSM z iných aplikácií."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Vzdialené ovládanie"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavenie pre plugin \"Remote Control\" Vzdialené ovládanie."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18433,34 +18595,34 @@
 "využívajúce tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Povolené činnosti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povoliť?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Potvrdiť činnosť vzdialenej kontroly"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Vzdialená kontrola požiadala o načítanie dát z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požiadavky: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18683,58 +18845,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Ukázať Info Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Priblíženie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Oddialiť"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Snímka na veľkosť dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "obrázok "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "automatické zväčšenie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "automatické nahratie dlaždíc"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Nastavenia pre SlippyMap plugin."
@@ -19023,11 +19185,10 @@
 msgstr "Rad (Terrace)"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Upraviť potrubie"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -20199,5 +20360,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -20324,59 +20485,59 @@
 msgstr "Prekrývajúce sa cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -20863,143 +21024,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "naraziť"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Prosím vložte index dlaždice"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Turniket (Stile)"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -21019,7 +21177,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "viacnásobný"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21126,12 +21283,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Výber s určeným hľadaním"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Cestné objekty"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -21148,9 +21303,9 @@
 msgstr "Vybrať nerozvetvené časti ciest"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Nastala výnimka/chyba"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Nie je v cache pamäti"
@@ -21211,21 +21366,21 @@
 msgstr "Nastavte polohu vybratej WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Prosím vybrať WMS vrstvu pre nastavenie."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Vybrať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Žačať nastavovanie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Žiadne vrstvy na nastavovanie"
@@ -21236,5 +21391,5 @@
 msgstr "Sťahovať WMS dlaždice z {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21245,5 +21400,5 @@
 "alebo koncový '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21251,10 +21406,10 @@
 msgstr "Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Varovanie: Úplná URL je ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21266,5 +21421,5 @@
 "Môže to viesť k zlým súradniciam."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21272,19 +21427,19 @@
 "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21299,17 +21454,17 @@
 "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Áno, stiahni obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Chybná URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21317,58 +21472,83 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Nastaviť WMS Záložku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatické sťahovanie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Nepodarilo sa nájsť objekt na mape."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru"
@@ -21437,8 +21617,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21955,16 +22134,21 @@
 "(obecný Java - tablet problém)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazenie OpenLayers obrázok pozadia"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje vydania z OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21974,5 +22158,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21981,5 +22165,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21990,5 +22174,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21999,10 +22183,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22010,15 +22194,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22028,5 +22212,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22037,10 +22221,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Určuje trasové schopnosti"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22049,5 +22233,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22058,15 +22242,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 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:82
+#: build/trans_plugins.java:84
 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:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22079,15 +22263,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22096,5 +22280,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22105,5 +22289,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22112,10 +22296,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22127,5 +22311,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22135,5 +22319,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22144,5 +22328,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22150,15 +22334,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Vyberte poradie nerozvetvených spojených ciest"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22169,5 +22353,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22211,4 +22395,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22241,10 +22426,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Pozemné komunikácie"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Hlavné komunikácie"
@@ -22255,5 +22440,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Dialnica"
@@ -22262,5 +22447,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Upraviť diaľnicu"
@@ -22297,10 +22482,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -22314,8 +22499,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Jazdné pruhy"
@@ -22334,13 +22519,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Max. rýchlosť (km/h)"
@@ -22374,17 +22559,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Jednosmerka"
@@ -22421,17 +22606,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22465,17 +22650,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunel"
@@ -22506,17 +22691,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Výkop"
@@ -22547,17 +22732,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Násyp"
@@ -22565,5 +22750,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Dialničná prípojka"
@@ -22572,5 +22757,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Upraviť dialničnú prípojku"
@@ -22578,5 +22763,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Cesta pre motorové vozidlá"
@@ -22585,5 +22770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Upraviť cestu pre motorové vozidlá"
@@ -22593,6 +22778,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Cesta pre motorové vozidlá"
@@ -22600,5 +22785,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Prípojka cesty pre motorové vozidla"
@@ -22607,5 +22792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Upraviť prípojku cesty pre motorové vozidla"
@@ -22618,5 +22803,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Cesta I. triedy"
@@ -22625,5 +22810,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Upraviť cestu I. triedy"
@@ -22631,10 +22816,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Prípojka cesty I. triedy"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Upraviť prípojku cesty I. triedy"
@@ -22646,5 +22831,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Cesta II. triedy"
@@ -22654,5 +22839,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Upraviť cestu II. triedy"
@@ -22660,5 +22845,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Cesta III. triedy"
@@ -22668,5 +22853,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Upraviť cestu III. triedy"
@@ -22678,5 +22863,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Miestna cesta neklasifikovaná (Unclassified)"
@@ -22686,5 +22871,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Upraviť Neklasifikovanú cestu"
@@ -22694,6 +22879,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Odovzdávacie miesta"
@@ -22716,15 +22901,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -22736,5 +22921,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ulica (miestna komunikácia)"
@@ -22743,5 +22928,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Upraviť ulicu"
@@ -22761,12 +22946,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Povrch"
@@ -22788,166 +22973,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "spevnený"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "nespevnený"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "betón (concrete)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "kov"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "drevo (wood)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "dlažobné kamene"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "dlažbová kocka (cobblestone)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "štrk (gravel)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "riečne kamene"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "zhutnená(valcovaná)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "trávový obkladač(grass_paver)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "tráva (grass)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "piesok (sand)"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "zem (ground)"
@@ -22955,5 +23140,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -22962,5 +23147,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Upraviť Obytnú zónu"
@@ -22968,5 +23153,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Pešia zóna"
@@ -22975,5 +23160,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Upraviť pešiu zónu"
@@ -22981,5 +23166,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Obslužná cesta (Service)"
@@ -22988,5 +23173,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Upraviť obslužnú cestu (Service)"
@@ -22996,18 +23181,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Typ obslužnej cesty (serviceway)"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "ulička(bočna ulica)"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "príjazdová cesta"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "parkovacia ulička(parking_aisle)"
@@ -23015,5 +23200,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Parkovacia ulička (Parking Aisle)"
@@ -23023,10 +23208,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Upraviť parkovaciu uličku (Parking Aisle)"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámy typ)"
@@ -23035,5 +23220,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Upraviť cestu neznámeho typu"
@@ -23041,14 +23226,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Stavba"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Upraviť komunikáciu vo výstavbe"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Križovatka"
@@ -23064,5 +23249,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -23071,5 +23256,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Cestné obmedzenie"
@@ -23078,15 +23263,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Upraviť cestné obmedzenie"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Mýto (Toll)"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulica"
@@ -23094,5 +23279,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Prístup"
@@ -23118,4 +23303,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23123,4 +23309,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23196,236 +23388,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "private (len pre vlastníka)"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive (súhlas vlastníka pozemku)"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "farmársky (agricultural)"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "lestníctvo"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "doručenie"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nie"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Poľnohospodársky"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "určený"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "private (len pre vlastníka)"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive (súhlas vlastníka pozemku)"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "farmársky (agricultural)"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "lestníctvo"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "doručenie"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nie"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Poľnohospodársky"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "určený"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "oficiálny"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Malé nákladná autá a dodávky"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladné vozidlá"
@@ -23440,10 +23639,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Kôň"
@@ -23459,10 +23658,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motocykel"
@@ -23477,19 +23677,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Dopravná obsluha"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. rýchlosť (km/h)"
@@ -23497,20 +23697,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnosť (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Max. Výška(v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Max. Šírka (v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Max. Dĺžka (v metroch)"
@@ -23518,5 +23718,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Kruhový objazd"
@@ -23527,5 +23727,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Upraviť kruhový objazd"
@@ -23545,10 +23745,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "dialnica (motorway)"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "dialničná prípojka"
@@ -23570,10 +23770,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "prípojka cesty pre motorové vozidlá"
@@ -23595,10 +23795,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "cesta prvej triedy"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "prípojka cesty I. triedy"
@@ -23620,5 +23820,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23633,9 +23833,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "cesta tretej triedy"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "cesta bez klasifikácie (unclassified)"
@@ -23649,9 +23849,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "obytná (osídlená)"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "obytná zóna"
@@ -23695,10 +23895,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "obslužná (service)"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "autobusová linka"
@@ -23728,5 +23928,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23738,10 +23938,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Editácia mosta"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Upraviť Tunel"
@@ -23749,10 +23949,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Vedľajšie komunikácie"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Poľná cesta (Track)"
@@ -23761,35 +23961,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Upraviť Stopu (Track)"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Typ stopy"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "kvalita1"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "kvalita2"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "kvalita3"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "kvalita4"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "kvalita5"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB Rozsah"
@@ -23797,5 +23997,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Cesta (chodník)"
@@ -23804,76 +24004,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Upraviť cestu (chodník)"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC Scale"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "horská_turistika"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "náročná_horská_turistika"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "vysokohorská_turistika"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "náročná_vysokohorská_turistika"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "ťažká_vysokohorská_turistika"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "vynikajúce"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "dobré"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "zlé"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "hrozné"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Vozíky"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Lyže"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Snežný skúter"
@@ -23882,5 +24082,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Vyhradená cesta pre kone"
@@ -23888,5 +24088,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Upraviť cestu pre kone"
@@ -23894,5 +24094,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Vyhradená cesta pre cyklistov"
@@ -23910,11 +24110,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Upraviť cyklistickú cestu"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Pešia"
@@ -23922,5 +24122,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Oddelený chodník - a cesta pre cyklistov"
@@ -23928,5 +24128,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinivaný chodník - a cesta pre cyklistov"
@@ -23934,5 +24134,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Vyhradený chodník pre peších"
@@ -23941,5 +24141,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Upraviť chodník"
@@ -23947,5 +24147,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Schody"
@@ -23955,10 +24155,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Upraviť únikové schody"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Počet sedadiel"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Ďialničná križovatka"
@@ -23966,15 +24172,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Upraviť diaľničnú križovatku"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Služby"
@@ -23982,5 +24188,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Upraviť servisnú stanicu (autoservis)"
@@ -23988,10 +24194,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -24020,36 +24227,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operátor"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "potok"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Upraviť reštauráciu"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Núdzový telefón"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -24059,5 +24287,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Typ prechodu pre chodcov"
@@ -24066,27 +24294,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "neriadený"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "semafor"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "ostrovček"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Prechod pre jazdcov na koňoch"
@@ -24094,6 +24322,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Prechod pre cyklistov"
@@ -24102,11 +24330,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Prechod cez cestu s obsluhou"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)"
@@ -24114,31 +24342,31 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "prechod pre chodcov (zebra)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "prechod pre chodcov (len čiarkované okraje)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 "pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Zastaviť (stop)"
@@ -24146,67 +24374,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Prechod pre chodcov"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Upraviť križovanie"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Typ mena (UK)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "naraziť"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "tabuľka"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Odovzdávacie miesto"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Upraviť odovzdávacie miesto"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objazd"
@@ -24217,14 +24383,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Smer"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "v smere hodinových ručičiek (pravotočivý)"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Prechod pre chodcov"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Upraviť križovanie"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Typ mena (UK)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "naraziť"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "tabuľka"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Odovzdávacie miesto"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Upraviť odovzdávacie miesto"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -24234,5 +24462,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Hranica mesta/obce"
@@ -24240,15 +24468,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Upraviť označenie hranice mesta/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Druhé meno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Kamera na meranie rýchlosti"
@@ -24257,11 +24485,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Núdzový telefón"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Sklon"
@@ -24269,5 +24492,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Prudký sklon"
@@ -24275,5 +24498,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -24283,10 +24506,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Brod"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Upraviť brod"
@@ -24294,5 +24517,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Horský priesmyk"
@@ -24300,5 +24523,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Upraviť horský priesmyk"
@@ -24307,10 +24530,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -24318,5 +24541,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Prekážka (Barriers)"
@@ -24324,5 +24547,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Stĺpik"
@@ -24330,5 +24553,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Upraviť stĺpik"
@@ -24373,16 +24596,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Povolená prevádzka:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Cyklo prekážka (Cycle Barrier)"
@@ -24391,5 +24614,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Balvan (Block)"
@@ -24397,5 +24620,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr ""
@@ -24405,5 +24628,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
@@ -24412,5 +24635,5 @@
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
@@ -24418,15 +24641,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Špičky (hroty)"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Upraviť Hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Mýtna búdka"
@@ -24434,5 +24657,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Upraviť mýtnu búdku"
@@ -24440,10 +24663,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Hraničná kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Upraviť hraničnú kontrolu"
@@ -24452,5 +24675,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Živý plot (Hedge)"
@@ -24461,22 +24684,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Plot"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "plot"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "drevený_plot"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "drôtený_plot"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Hradby"
@@ -24484,5 +24707,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Mestské hradby"
@@ -24491,5 +24714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Oporný múr"
@@ -24500,10 +24723,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Upraviť vstup"
@@ -24511,5 +24734,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Brána"
@@ -24517,50 +24740,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Upraviť bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Závora (Lift Gate)"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Upraviť závoru (Lift Gate)"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Brána pre zvieratá (Hampshire)"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Upraviť bránu pre zvieratá (hampshire)"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Brána pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Turniket (Stile)"
@@ -24568,25 +24791,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Upraviť turniket"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Upraviť Turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 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:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -24596,25 +24819,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Prameň"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Upraviť prameň"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Odvodňovací kanál, odtok"
@@ -24622,10 +24834,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Upraviť odvodňovací kanál, odtok"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Priekopa"
@@ -24633,10 +24845,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Upraviť priekopu"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Potok"
@@ -24644,10 +24856,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Upraviť potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Prieplav"
@@ -24655,10 +24867,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Upraviť prieplav"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Rieka"
@@ -24668,59 +24880,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Upraviť rieku"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Prameň"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Upraviť prameň"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Vodopád"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Upraviť vodopád"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Priehradzka"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Upraviť priehradzku"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Priehrada, nádrž"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Upraviť priehradu, nádrž"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Basin (Kotvisko pre lode)"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Upraviť Basin (Kotvisko pre lode)"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Nádrž"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Upraviť nádrž"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Krytá nádrž"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Upraviť krytú nádrž"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Upraviť vodu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Zem (Pevnina)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Upraviť Zem (Pevnina)"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Basin (Kotvisko pre lode)"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Upraviť Basin (Kotvisko pre lode)"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Nádrž"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Upraviť nádrž"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Krytá nádrž"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Upraviť krytú nádrž"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Pobrežie"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Upraviť pobrežie"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Riečny breh"
@@ -24729,10 +24995,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Upraviť riečny breh"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Mokraď"
@@ -24743,14 +25010,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Upraviť mokraď"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "Močiar"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "slatina"
@@ -24764,35 +25031,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "močiar (marsh)"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "mokraď´s rákosím"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "soľná bažina"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "prílivová oblasť"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangrovová oblasť"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Blato"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Upraviť blato"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Pláž"
@@ -24800,20 +25067,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Upraviť pláž"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Záliv"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Upraviť záliv"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Útes"
@@ -24821,145 +25088,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Upraviť útes"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Pobrežie"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Upraviť pobrežie"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Nakupovanie"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Prístavisko prievozu, trajektu"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Upraviť prístavisko prievozu, trajektu"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Vozidlo"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "pre začiatočníkov"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bicykel"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Prievoz, trajekt"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Upraviť prievoz, trajekt"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Lodenica"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Upraviť lodenicu"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dok, prístavná hrádza"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Upraviť dok, prístavnú hrádzu"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Priehrada, nádrž"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Upraviť priehradu, nádrž"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Vodné objekty"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Prístav (Marina)"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Upraviť Prístav (Marina)"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Mólo"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Upraviť mólo"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Plavebná komora"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Priehradzka"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Upraviť priehradzku"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Vodopád"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Upraviť vodopád"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Turning Point (koniec cesty)"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Prístav (Marina)"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Upraviť Prístav (Marina)"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Mólo"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Upraviť mólo"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Prístavisko prievozu, trajektu"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Upraviť prístavisko prievozu, trajektu"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24969,16 +25307,38 @@
 msgstr "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Lodenica"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Upraviť lodenicu"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dok, prístavná hrádza"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Upraviť dok, prístavnú hrádzu"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Preprava"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Železnica (štandardná)"
@@ -24986,5 +25346,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Upraviť železničnú koľaj"
@@ -25014,7 +25374,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "rozmer (mm)"
@@ -25030,8 +25390,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Typy"
@@ -25045,29 +25405,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "železničná vlečka v závode"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "vedľajšia koľaj (napr: na stanici)"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "železničná vlečka"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Elektrifikovaný"
@@ -25080,8 +25440,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "električkové_vedenie"
@@ -25152,8 +25512,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25165,8 +25525,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Napätie"
@@ -25179,8 +25539,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Kmitočet (Hz)"
@@ -25193,23 +25553,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnica"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upraviť úzkorozchodnú železnicu"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Jednokoľajka, vysutá dráha"
@@ -25217,50 +25577,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Upraviť jednokoľajku, vysutú dráhu"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Historická železnica"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Upraviť zachovanú železnicu (v prevádzke)"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Rýchloelektrička"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Upraviť električku"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Upraviť metro"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Električka"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Upraviť električku"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Autobusová linka"
@@ -25268,5 +25628,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Upraviť autobusovú linku"
@@ -25275,10 +25635,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnica"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Upraviť nepoužívanú železnicu"
@@ -25287,9 +25647,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Voliteľné typy"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Opustená železnica"
@@ -25298,5 +25658,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Železničné priecestie"
@@ -25305,5 +25665,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Peší prechod cez železnicu"
@@ -25313,5 +25673,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Typy prechodov cez cestu"
@@ -25319,5 +25679,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Točňa"
@@ -25326,5 +25686,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Nárazník"
@@ -25333,10 +25693,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Lanovka"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -25344,10 +25704,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Upraviť sedačkovú lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -25355,5 +25715,5 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
@@ -25361,5 +25721,5 @@
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Kabínková lanovka"
@@ -25367,10 +25727,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Upraviť kabínkovú lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "Gondola"
@@ -25378,10 +25738,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Upraviť Gondolu"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25390,5 +25751,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25396,5 +25757,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25403,5 +25764,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25409,5 +25770,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Čerpacia stanica"
@@ -25417,69 +25778,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Upraviť čerpaciu stanicu"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "zem"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "Prírastok"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25496,34 +25880,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25531,37 +25916,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Otváracia doba"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25582,33 +25978,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25617,170 +26015,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "obchod"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Obchod s polotovarmi"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Stánok"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Typy palív"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Nafta"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Bio nafta"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Nafta pre ťažké nákladné automobily"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "Oktán 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "Oktán 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "Oktán 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "Oktán 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Skvapalnený ropný plyn)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Stlačený zemný plyn)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 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:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
@@ -25788,4 +26208,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -25797,6 +26218,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkovisko"
@@ -25805,5 +26226,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Upraviť parkovisko"
@@ -25814,25 +26235,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referenčné číslo"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "mnohoposchodový"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "povrch"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "podzemie"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "P+R parkovisko"
@@ -25841,54 +26264,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Poplatok"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Kapacita (celková)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Miesta pre vozíčkárov"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Priestory pre ženy"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Priestory pre rodičov s detmi"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Umývačka"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Upraviť umývačku aut"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Obchod s autami"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Upraviť obchod s autami"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Servis"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Typy"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Upraviť strom"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Obsah"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefónne číslo"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Požičovňa"
@@ -25897,10 +26464,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -25908,28 +26474,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Upraviť parkovisko bicyklov"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Kapacita"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motocykel"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Upraviť diaľnicu"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Služby"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Mierka"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "zlé"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Predvoľby"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Handry"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Kapacita"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Bicyklový obchod"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Upraviť bicyklový obchod"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25939,5 +26564,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25945,5 +26570,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -25951,5 +26576,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -25957,5 +26582,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -25963,5 +26588,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -25970,5 +26595,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -25976,5 +26601,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -25983,5 +26608,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -25993,5 +26618,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -25999,10 +26624,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -26011,10 +26636,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -26023,5 +26648,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -26030,5 +26655,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -26036,5 +26661,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -26044,13 +26669,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -26058,19 +26682,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Lavička"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Hmatové Dlažby"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -26078,5 +26702,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -26084,5 +26708,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -26090,10 +26714,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Letisko"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Letisko, pozemné"
@@ -26101,5 +26725,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Upraviť pozemné letisko"
@@ -26107,10 +26731,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -26119,5 +26743,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Pristávacia dráha"
@@ -26125,5 +26749,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Upraviť pristávaciu dráhu"
@@ -26131,5 +26755,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Rolovacie dráhy"
@@ -26137,5 +26761,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Upraviť rolovacie dráhy"
@@ -26143,5 +26767,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Pristávacia plocha pre vrtuľníky"
@@ -26149,5 +26773,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Upraviť pristávaciu plochu pre vrtuľníky"
@@ -26157,5 +26781,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Pristávacia plocha"
@@ -26165,5 +26789,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Hangár"
@@ -26174,6 +26798,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -26183,5 +26807,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Veterný rukáv"
@@ -26190,5 +26814,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Terminál"
@@ -26196,5 +26820,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Upraviť terminál"
@@ -26202,15 +26826,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Upraviť terminál"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Cestovanie"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -26222,5 +26846,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -26229,5 +26853,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
@@ -26240,8 +26864,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Hviezdičkový"
@@ -26265,34 +26889,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -26306,168 +26930,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminál"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefónne číslo"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -26475,20 +27004,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Chata"
@@ -26496,10 +27025,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -26507,30 +27036,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -26538,10 +27068,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -26552,5 +27082,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -26558,5 +27088,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -26564,5 +27094,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -26570,79 +27102,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "sendvič"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -26650,18 +27182,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "kura"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -26669,10 +27201,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -26680,10 +27212,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Krčma"
@@ -26691,20 +27228,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -26712,10 +27249,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -26723,25 +27260,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Múzeum"
@@ -26749,9 +27286,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -26760,9 +27297,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Zábavný park"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Edit Theme Park"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Umelecké dielo"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Upraviť umelecké dielo"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -26770,50 +27328,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Zábavný park"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Edit Theme Park"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Umelecké dielo"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Upraviť umelecké dielo"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Upraviť prístrešok"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Ohnisko"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Výletné miesto"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Upraviť výletné miesto"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Úroveň detailu"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "topografická"
@@ -26851,5 +27410,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26857,28 +27416,28 @@
 msgstr "pouličná sieť"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "prehľadová (oreintačná)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Zobrazená oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "miesto (blízke okolie)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "mesto (city)"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "oblasť (region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -26888,5 +27447,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Zobrazené cesty sú pre:"
@@ -26894,5 +27453,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Turistika"
@@ -26900,6 +27459,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -26907,5 +27466,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "Horský bicykel"
@@ -26913,6 +27472,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -26920,5 +27479,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "Jazdectvo"
@@ -26926,46 +27485,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... iný druh prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "upozornenie"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26974,5 +27533,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Informačný terminál"
@@ -26980,55 +27539,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Ostatné (iné) informačné body (miesta)"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Upraviť prístrešok"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Ohnisko"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Výletné miesto"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Upraviť výletné miesto"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Hrad"
@@ -27037,19 +27575,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Zrúcanina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Upraviť zrúcaninu"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -27058,9 +27596,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -27068,10 +27606,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Palaeontological Areál"
@@ -27079,5 +27617,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Upraviť Palaeontological Areál"
@@ -27085,15 +27623,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Pomník"
@@ -27101,55 +27639,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Ihrisko"
@@ -27157,35 +27695,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -27199,6 +27737,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -27614,6 +28152,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27648,78 +28186,78 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
@@ -27727,165 +28265,165 @@
 "trávnika)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -27902,5 +28440,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27927,23 +28464,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "typ"
@@ -27960,5 +28505,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27985,211 +28529,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "stopa"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motošport"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Upraviť motošport"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -28197,52 +28744,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Streľba"
@@ -28250,204 +28797,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motošport"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Upraviť motošport"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Upozornenie"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Upraviť parkovisko"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Osobné automobily"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Upraviť motošport"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Upraviť korčuľovanie"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Upraviť hraničnú kontrolu"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Vozidlo"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Upraviť kabínkovú lanovku"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Budova"
@@ -28455,5 +29068,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -28461,10 +29074,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -28472,10 +29085,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -28483,10 +29096,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Súd"
@@ -28495,10 +29108,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Vezenie"
@@ -28507,10 +29120,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polícia"
@@ -28520,10 +29133,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -28532,10 +29145,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Pošta"
@@ -28543,5 +29156,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -28549,15 +29162,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Škola"
@@ -28565,10 +29178,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Univerzita"
@@ -28576,10 +29189,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Vysoká škola"
@@ -28587,5 +29200,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -28593,5 +29206,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kino"
@@ -28600,10 +29213,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Knižnica"
@@ -28612,9 +29225,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -28622,10 +29235,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Divadlo"
@@ -28634,10 +29247,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -28647,5 +29260,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -28654,6 +29267,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -28662,66 +29275,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -28730,189 +29343,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnitská"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresy"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Upraviť informácie o adrese"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Číslo domu"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Meno domu"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Názov ulice"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Názov mesta"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Poštové smerovacie číslo"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Kód krajiny"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Upraviť interpoláciu adries"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Schéma číslovania"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "nepárne"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "párne"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "abecedný"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -28920,25 +29463,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Maják"
@@ -28946,10 +29489,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -28957,10 +29500,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -28969,41 +29512,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "teplo(heat)"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -29013,10 +29556,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Žeriav"
@@ -29024,5 +29567,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
@@ -29030,10 +29573,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -29041,10 +29584,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -29052,23 +29595,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "vnútorný"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "vonkajší"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "verejný"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -29078,35 +29621,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -29115,10 +29658,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -29127,5 +29670,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -29133,10 +29676,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -29147,23 +29690,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -29172,20 +29715,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29193,55 +29736,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toalety"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "omedzený"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefón"
@@ -29250,5 +29793,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -29256,5 +29799,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mince"
@@ -29262,5 +29805,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Bankovky"
@@ -29268,5 +29811,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -29274,5 +29817,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -29280,15 +29823,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -29297,5 +29840,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -29303,35 +29846,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Plechovky"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Handry"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Odpadkový kôš"
@@ -29339,5 +29877,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Upraviť odpadkový kôš"
@@ -29346,31 +29884,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "hnedá"
@@ -29449,5 +29987,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29457,31 +29995,31 @@
 msgstr "zelená"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -29489,31 +30027,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontána"
@@ -29522,10 +30060,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -29534,10 +30072,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29546,5 +30084,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Upraviť hydrant"
@@ -29552,501 +30090,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Pešo"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Upraviť supermarket"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Obchod s polotovarmi"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Upraviť obchod s polotovarmi"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Stánok"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Upraviť stánok"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Mäsiareň"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Upraviť mäsiarstvo"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Chlieb a pečivo"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Upraviť chlieb a pečivo"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Biopotraviny"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Upraviť biopotraviny"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Upraviť Obchod s alkoholickými nápojmi"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Nápoje"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Upraviť Obchod s nápojmi."
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Obchody"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Lekáreň"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Upraviť lekáreň"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Kaderníctvo"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Upraviť kaderníctvo"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optik"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Upraviť očnú optiku"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Upraviť počítačový obchod"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Obuva"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Upravit obchod s obuvou"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Turistický (Outdoor)"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Upraviť športový obchod"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Chemická čistiareň"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Upraviť chemickú čistiareň"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Práčovňa"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Upraviť práčovňu"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "nadchod nad železnicou"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Upraviť železničnú koľaj"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Počítač"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Upraviť počítačový obchod"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Upraviť obchod s elektronikou"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Upraviť obchod s Hifi elektronikou"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Obchod s DVD"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Upraviť obchod s DVD"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Kvetinárstvo"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Upraviť kvetinárstvo"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Záhradné centrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Upraviť záhradné centrum"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Železiarstvo"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Upraviť železiarstvo"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Obchod Urob si sám"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Upraviť obchod Urob si sám"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Nábytok"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Upraviť obchod s nábytkom"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Papierníctvo"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Upraviť papierníctvo"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Kníhkupectvo"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Upraviť kníhkupectvo"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Cestovná kancelária"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Upraviť cestovnú kanceláciu"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Hračky"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Upraviť obchod s hračkami"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Predajný automat"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Upraviť predajný automat"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Predávané výrobky"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "lístky MHD"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "plány MHD"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "parkovacie lístky"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "jedlo"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "pitie"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "sladkosti"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "cigarety"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotky"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "krmivo pre zvieratá"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "noviny"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "hračky"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "známky"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-karty"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telefónne kupóny (poukážky)"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "kupóny (poukážky)"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "kondómy"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampóny"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "sáčky na výkaly"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "Prístupové alebo vernostné karty"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Hotovosť"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banka"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Upraviť banku"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Bankomat"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Zmenáreň"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Upraviť zmenáreň"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Upraviť bankomat"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Zdravie"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Lekári"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Upraviť lekárov"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Zubný lekár"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Upraviť zubného lekára"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Lekáreň"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Upraviť lekáreň"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "výdaj na recepty"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Nemocnica"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Upraviť nemocnicu"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Obchody"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Obchod s autami"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Upraviť obchod s autami"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Bicyklový obchod"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Upraviť bicyklový obchod"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Upraviť supermarket"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Lekáreň"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Upraviť lekáreň"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Obchod s polotovarmi"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Upraviť obchod s polotovarmi"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Stánok"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Upraviť stánok"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Kníhkupectvo"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Upraviť kníhkupectvo"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Cestovná kancelária"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Upraviť cestovnú kanceláciu"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Mäsiareň"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Upraviť mäsiarstvo"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Chlieb a pečivo"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Upraviť chlieb a pečivo"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Kvetinárstvo"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Upraviť kvetinárstvo"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Biopotraviny"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Upraviť biopotraviny"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Upraviť Obchod s alkoholickými nápojmi"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Nápoje"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Upraviť Obchod s nápojmi."
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Počítač"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Upraviť počítačový obchod"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Upraviť obchod s elektronikou"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Upraviť obchod s Hifi elektronikou"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Nábytok"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Upraviť obchod s nábytkom"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Záhradné centrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Upraviť záhradné centrum"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Železiarstvo"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Upraviť železiarstvo"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Obchod Urob si sám"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Upraviť obchod Urob si sám"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Papierníctvo"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Upraviť papierníctvo"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Kaderníctvo"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Upraviť kaderníctvo"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Obuva"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Upravit obchod s obuvou"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Hračky"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Upraviť obchod s hračkami"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Obchod s DVD"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Upraviť obchod s DVD"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Chemická čistiareň"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Upraviť chemickú čistiareň"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Práčovňa"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Upraviť práčovňu"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Turistický (Outdoor)"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Upraviť športový obchod"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optik"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Upraviť očnú optiku"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Predajný automat"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Upraviť predajný automat"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Predávané výrobky"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "lístky MHD"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "plány MHD"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "parkovacie lístky"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "jedlo"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "pitie"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "sladkosti"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "cigarety"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotky"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "krmivo pre zvieratá"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "noviny"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "hračky"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "známky"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-karty"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telefónne kupóny (poukážky)"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "kupóny (poukážky)"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "kondómy"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampóny"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "sáčky na výkaly"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "Prístupové alebo vernostné karty"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Hotovosť"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banka"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Upraviť banku"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Bankomat"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Zmenáreň"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Upraviť zmenáreň"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Upraviť bankomat"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Zdravie"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Lekári"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Upraviť lekárov"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Zubný lekár"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Upraviť zubného lekára"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Lekáreň"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Upraviť lekáreň"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "výdaj na recepty"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Nemocnica"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Upraviť nemocnicu"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -30055,5 +30595,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -30062,15 +30602,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -30078,5 +30618,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -30085,369 +30625,375 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Hranice"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Štátna"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Upraviť štátne hranice"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administratívne"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Upraviť administratívne hranice"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Občianske"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Upraviť občiansku hranicu"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politická"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Upraviť politickú hranicu"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Národný park"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Miesta"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Krajina (štát)"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Stav"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Upraviť štát"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Oblasť (región)"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "kraj (okres)"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Mesto (city)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Mesto (town)"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Štvrť"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Dedina"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Vrchol"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Upraviť vrchol kopca"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Ľadovec"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Upraviť ľadovec"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Sopka"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Upraviť sopku"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Vstup do jaskyne"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Upraviť vstup do jaskyne"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Ostrov"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Ostrovček"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "príroda"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Strom"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Upraviť strom"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botanický názov"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Drevo"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Upraviť Drevo"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "ihličnatý"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "listnatý"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "zmiešaný"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Les"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Upraviť les"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Prírodná rezervácia"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Upraviť prírodnú rezerváciu"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Vstup do jaskyne"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Upraviť vstup do jaskyne"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Vrchol"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Upraviť vrchol kopca"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Ľadovec"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Upraviť ľadovec"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Sopka"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Upraviť sopku"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Hranice"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Štátna"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Upraviť štátne hranice"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administratívne"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Upraviť administratívne hranice"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Občianske"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Upraviť občiansku hranicu"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politická"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Upraviť politickú hranicu"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Národný park"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-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:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Sutina"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Upraviť sutinu"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+"Upraviť fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Krovie"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Upraviť krovie"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Vresovisko"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Upraviť vresovisko"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Strom"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Upraviť strom"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botanický názov"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Drevo"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Upraviť Drevo"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "ihličnatý"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "listnatý"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "zmiešaný"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Les"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Upraviť les"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Prírodná rezervácia"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Upraviť prírodnú rezerváciu"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Sutina"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Upraviť sutinu"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Krovie"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Upraviť krovie"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-"Upraviť fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Vresovisko"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Upraviť vresovisko"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Farma"
@@ -30456,45 +31002,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -30502,25 +31048,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -30528,10 +31074,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -30539,20 +31085,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -30560,5 +31106,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -30566,15 +31112,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -30582,9 +31128,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -30592,39 +31138,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -30632,15 +31178,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -30648,52 +31194,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Stanica"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresy"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Upraviť informácie o adrese"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Číslo domu"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Meno domu"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Názov ulice"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Názov mesta"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Poštové smerovacie číslo"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Kód krajiny"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "V"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "J"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Upraviť interpoláciu adries"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Schéma číslovania"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "nepárne"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "párne"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "abecedný"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Obsah"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Pridať informáciu o autorovi"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Obrázok"
 
 #. item "Relations/Multipolygon"
@@ -30701,5 +31380,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -30711,5 +31390,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
@@ -30717,5 +31396,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -30723,5 +31402,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -30732,5 +31411,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -30738,36 +31417,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -30775,5 +31454,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -30782,5 +31461,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -30788,34 +31467,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -30824,15 +31503,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "k ceste"
@@ -30840,5 +31519,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -30847,5 +31526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -30853,132 +31532,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bicykel"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "lyžovanie"
@@ -31046,5 +31614,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31054,9 +31622,9 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "obchádzka"
@@ -31070,10 +31638,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -31081,31 +31649,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -31114,30 +31682,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -35115,7 +35683,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35237,9 +35804,15 @@
 msgstr "Sicily - Italy"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
 
+#~ msgid "Keep backup files"
+#~ msgstr "Ponechávať záložné súbory"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Vodné objekty"
+
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -35256,7 +35829,4 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyriešiť konflikty"
-
-#~ msgid "Image"
-#~ msgstr "Obrázok"
 
 #~ msgid "my version:"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 22859)
+++ applications/editors/josm/i18n/po/sl.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-06-28 15:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -95,5 +95,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Pozor"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Javanski urejevalnik za OpenStreetMap"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -233,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -262,5 +262,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -295,5 +295,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -402,4 +402,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -417,5 +418,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1033,5 +1034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1040,5 +1041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr ""
@@ -1431,13 +1432,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1446,5 +1447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1452,9 +1453,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1462,5 +1463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1494,8 +1495,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1504,9 +1505,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1522,6 +1523,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1531,5 +1532,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1554,6 +1555,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Napaka"
@@ -1711,5 +1712,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr ""
@@ -1985,5 +1986,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2448,5 +2449,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2487,9 +2488,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2498,9 +2499,9 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2758,5 +2759,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Iskanje"
@@ -2946,7 +2947,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3208,5 +3209,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3360,31 +3361,31 @@
 msgstr "Samodejno popravljanje oznak"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3403,15 +3404,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3420,5 +3421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3427,5 +3428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3434,5 +3435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3441,5 +3442,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3447,5 +3448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3454,5 +3455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3461,5 +3462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3468,5 +3469,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3475,10 +3476,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3598,5 +3599,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3668,9 +3669,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3678,5 +3679,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3872,14 +3873,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "O programu"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+msgid "Hemisphere"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3904,9 +3923,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3949,5 +3968,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "železnica"
@@ -3968,5 +3987,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4219,69 +4238,69 @@
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "uporaba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Prikaži to pomoč"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4291,9 +4310,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "primeri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4301,57 +4320,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Pripravljanje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Privzete nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Debetne kartice"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4361,9 +4391,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4377,9 +4407,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4501,23 +4532,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "plasti ni na seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4608,5 +4639,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4614,17 +4645,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4634,25 +4665,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5047,4 +5078,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5127,4 +5159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5141,4 +5174,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5212,5 +5246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5222,10 +5256,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "brez"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr ""
@@ -5307,5 +5341,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5317,5 +5351,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5350,17 +5384,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5368,15 +5402,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5384,10 +5418,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5399,5 +5433,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5409,5 +5443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5550,5 +5584,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5661,5 +5695,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5667,5 +5701,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5673,5 +5707,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5679,5 +5713,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5685,5 +5719,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5692,5 +5726,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5698,5 +5732,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5704,5 +5738,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5710,24 +5744,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5748,5 +5782,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5771,37 +5805,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Vpišite koordinate novega vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Uporabi decimalne stopinje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negativne vrednosti pomenijo zahodno/južno poloblo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5857,9 +5891,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relacije"
@@ -5907,10 +5941,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5930,37 +5964,37 @@
 msgstr "Odpri okno s seznamom izbora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Povečava na ves izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Povečava na izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5969,32 +6003,32 @@
 msgstr "Izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6271,13 +6305,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6389,4 +6423,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6405,6 +6443,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6422,8 +6458,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6434,4 +6477,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6446,33 +6495,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6496,12 +6534,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6573,10 +6621,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6606,8 +6658,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6670,6 +6718,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6722,4 +6768,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6784,32 +6842,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6818,6 +6884,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6826,24 +6894,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6858,82 +6916,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7014,155 +7072,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Naziv"
@@ -7586,4 +7649,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<različno>"
@@ -8092,17 +8156,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8379,4 +8443,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8384,15 +8449,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Vrsta"
@@ -8411,16 +8476,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "neznan"
@@ -8985,5 +9050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9206,20 +9271,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Plast"
@@ -9666,5 +9731,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Opis"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Meni: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9672,62 +9795,19 @@
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Opis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] ""
 msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Opis"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9735,10 +9815,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9749,7 +9829,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9757,10 +9837,10 @@
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9768,10 +9848,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9779,21 +9859,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9805,9 +9885,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9815,5 +9895,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9821,30 +9901,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9852,5 +9932,5 @@
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9859,5 +9939,5 @@
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9866,18 +9946,18 @@
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9887,23 +9967,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10342,15 +10422,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Ni slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11281,4 +11361,47 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+msgid "Auto save interval (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Privzeta vrednost je ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Pri shranjevanju ohrani varnostne kopije s končnico \"~\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11361,5 +11484,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Avtomobil"
@@ -11378,16 +11501,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Kolo"
@@ -11421,12 +11544,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr ""
@@ -11674,18 +11797,18 @@
 msgstr "Privzeto (samodejna izbira)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12000,26 +12123,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12135,6 +12250,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+msgid "Internal style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12351,12 +12474,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Ohrani varnostne kopije datotek"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Pri shranjevanju ohrani varnostne kopije s končnico \"~\""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12536,5 +12651,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12543,49 +12658,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12595,15 +12710,15 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12615,17 +12730,17 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13233,5 +13348,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13329,5 +13444,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13336,5 +13451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13403,5 +13518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13411,10 +13526,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13422,5 +13537,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13428,5 +13543,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13434,10 +13549,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13445,5 +13560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13451,5 +13566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13457,5 +13572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13464,10 +13579,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13475,9 +13590,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13485,11 +13600,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "predmet z id=0 ni dovoljen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13501,8 +13616,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13516,5 +13631,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13522,5 +13637,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13529,6 +13644,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13540,6 +13655,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13548,5 +13663,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13554,5 +13669,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13560,12 +13675,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13573,5 +13688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13581,5 +13696,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13589,5 +13704,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13595,17 +13710,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Priprava podatkov OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14107,11 +14222,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14120,16 +14235,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14138,5 +14253,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14157,13 +14272,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Ne stori ničesar"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Prijavi napako"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14172,9 +14287,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Nepričakovana napaka"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14182,5 +14297,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14188,5 +14303,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14195,5 +14310,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14201,9 +14316,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(besedilo je že bilo prekopirano na odložišče.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14397,5 +14512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14448,5 +14563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14456,5 +14571,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14462,5 +14577,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14469,5 +14584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Namig: Bližnjice lahko urejate v nastavitvah.)"
@@ -14568,5 +14683,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14652,10 +14767,61 @@
 msgstr "Pošlji sledi na openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Uredi svetilnik"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Spremeni lastnosti do {0} predmetov"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Izberite"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Zemljevid: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Orodje: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Hitrost"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -14827,51 +14993,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Ni mogoče dodati vozlišča izven tega sveta."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14970,16 +15138,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -14993,5 +15153,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15104,5 +15264,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Zgradbe"
@@ -15339,5 +15499,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15752,8 +15912,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15867,6 +16023,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Prazna plast"
@@ -17220,5 +17376,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Javni prevoz"
@@ -17262,48 +17418,52 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "import data from URL"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "spremeni izbor"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17312,34 +17472,34 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17562,58 +17722,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Naloži ploščico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Naloži vse ploščice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17897,11 +18057,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Uredi cevovod"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -18980,5 +19139,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19098,59 +19257,59 @@
 msgstr "Prekrivajoče poti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19629,141 +19788,140 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "gor"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19896,9 +20054,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -19957,21 +20115,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -19982,5 +20140,5 @@
 msgstr "Naloži vidne ploščice WMS iz {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -19989,5 +20147,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -19995,10 +20153,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20007,24 +20165,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20035,75 +20193,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
@@ -20662,16 +20844,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20679,5 +20866,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20685,5 +20872,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20692,5 +20879,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20699,10 +20886,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20710,15 +20897,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20728,5 +20915,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20735,10 +20922,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20747,5 +20934,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20754,15 +20941,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20772,15 +20959,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20789,5 +20976,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20796,5 +20983,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20803,10 +20990,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20815,5 +21002,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20823,5 +21010,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20830,20 +21017,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20852,5 +21039,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20892,4 +21079,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20922,10 +21110,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Ceste"
@@ -20936,5 +21124,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Avtocesta"
@@ -20943,5 +21131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Uredi avtocesto"
@@ -20978,10 +21166,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr ""
@@ -20995,8 +21183,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Voznih pasov"
@@ -21015,13 +21203,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -21055,17 +21243,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -21102,17 +21290,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21146,17 +21334,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Predor"
@@ -21187,17 +21375,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Usek"
@@ -21228,17 +21416,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Nasip"
@@ -21246,5 +21434,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Avtocestni priključek"
@@ -21253,5 +21441,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Uredi avtocestni priključek"
@@ -21259,5 +21447,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Hitra cesta"
@@ -21266,5 +21454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Uredi hitro cesto"
@@ -21274,6 +21462,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21281,5 +21469,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Priključek hitre ceste"
@@ -21288,5 +21476,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Uredi priključek hitre ceste"
@@ -21299,5 +21487,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Glavna cesta (1.,2. reda)"
@@ -21306,5 +21494,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Uredi glavna cesta (1.,2. reda)"
@@ -21312,10 +21500,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Priključek glavne ceste"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Uredi priključek glavne ceste"
@@ -21327,5 +21515,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Regionalna cesta (1.,2. reda)"
@@ -21335,5 +21523,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Uredi regionalno cesto (1.,2. reda)"
@@ -21341,5 +21529,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Regionalna cesta (3. reda, turistična)"
@@ -21349,5 +21537,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Uredi regionalno cesto (3. reda, turistična)"
@@ -21359,5 +21547,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -21367,5 +21555,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -21375,6 +21563,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21397,15 +21585,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21417,5 +21605,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -21424,5 +21612,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr ""
@@ -21442,12 +21630,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Površina"
@@ -21469,166 +21657,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21636,5 +21824,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr ""
@@ -21643,5 +21831,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr ""
@@ -21649,5 +21837,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr ""
@@ -21656,5 +21844,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -21662,5 +21850,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr ""
@@ -21669,5 +21857,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr ""
@@ -21677,18 +21865,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21696,5 +21884,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -21704,10 +21892,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznana kategorija)"
@@ -21716,5 +21904,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Uredi cesto neznane kategorije"
@@ -21722,14 +21910,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr ""
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr ""
@@ -21745,5 +21933,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "krožišče"
@@ -21752,5 +21940,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Cestne omejitve"
@@ -21759,15 +21947,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Uredi cestne omejitve"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Cestnina"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Brez izhoda (slepa ulica)"
@@ -21775,5 +21963,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Dostop"
@@ -21799,4 +21987,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21804,4 +21993,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21877,236 +22072,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr ""
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr ""
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr ""
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr ""
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -22121,10 +22323,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr ""
@@ -22140,10 +22342,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr ""
@@ -22158,19 +22361,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Najnižja hitrost (km/h)"
@@ -22178,20 +22381,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22199,5 +22402,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Krožišče"
@@ -22208,5 +22411,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr ""
@@ -22226,10 +22429,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr ""
@@ -22251,10 +22454,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "hitra cesta"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr ""
@@ -22276,10 +22479,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "glavna"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr ""
@@ -22301,5 +22504,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22314,9 +22517,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "regionalna (turistična)"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr ""
@@ -22330,9 +22533,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr ""
@@ -22376,10 +22579,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr ""
@@ -22409,5 +22612,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22419,10 +22622,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Uredi most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr ""
@@ -22430,10 +22633,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Poti"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr ""
@@ -22442,35 +22645,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22478,5 +22681,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Steza"
@@ -22485,76 +22688,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Uredi stezo"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr ""
@@ -22563,5 +22766,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22569,5 +22772,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr ""
@@ -22575,5 +22778,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22591,11 +22794,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Uredi kolesarsko stezo"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22603,5 +22806,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22609,5 +22812,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22615,5 +22818,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22622,5 +22825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Uredi pešpot"
@@ -22628,5 +22831,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Stopnice"
@@ -22636,10 +22839,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Uredi stopnice"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Avtocestno križišče"
@@ -22647,15 +22855,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Uredi avtocestno križišče"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr ""
@@ -22663,5 +22871,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -22669,10 +22877,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22701,36 +22910,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr ""
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Izbrana površina"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Uredi potok"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr ""
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -22740,5 +22970,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -22747,27 +22977,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22775,6 +23005,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22783,11 +23013,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22795,30 +23025,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stop znak"
@@ -22826,67 +23056,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr ""
@@ -22897,14 +23065,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Obračališče"
@@ -22914,5 +23144,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Znak za naselje"
@@ -22920,15 +23150,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Uredi znak za naselje"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr ""
@@ -22937,11 +23167,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr ""
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22949,5 +23174,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -22955,5 +23180,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -22963,10 +23188,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr ""
@@ -22974,5 +23199,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Gorski prelaz"
@@ -22980,5 +23205,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Uredi gorski prelaz"
@@ -22987,10 +23212,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr ""
@@ -22998,5 +23223,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Ovire"
@@ -23004,5 +23229,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Stebriček"
@@ -23010,5 +23235,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr ""
@@ -23053,16 +23278,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23071,5 +23296,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23077,5 +23302,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -23083,10 +23308,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr ""
@@ -23094,15 +23319,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Cestninska postaja"
@@ -23110,5 +23335,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Uredi cestninsko postajo"
@@ -23116,10 +23341,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr ""
@@ -23128,5 +23353,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr ""
@@ -23137,22 +23362,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr ""
@@ -23160,5 +23385,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr ""
@@ -23167,5 +23392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr ""
@@ -23176,10 +23401,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr ""
@@ -23187,5 +23412,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Vrata"
@@ -23193,50 +23418,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr ""
@@ -23244,25 +23469,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr ""
@@ -23270,25 +23495,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Izvir"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Uredi izvir"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr ""
@@ -23296,10 +23510,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23307,10 +23521,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Potok"
@@ -23318,10 +23532,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanal"
@@ -23329,10 +23543,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Reka"
@@ -23342,59 +23556,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Uredi reko"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Izvir"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Uredi izvir"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Slap"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Uredi slap"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr ""
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Jez"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Uredi jez"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr ""
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr ""
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Kopno"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Uredi kopno"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr ""
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr ""
@@ -23403,10 +23671,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr ""
@@ -23417,14 +23686,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr ""
@@ -23438,35 +23707,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr ""
@@ -23474,20 +23743,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr ""
@@ -23495,145 +23764,214 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr ""
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr ""
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Izvir"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Avtomobil"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+msgid "passengers"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Pot trajekta"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Ladjedelnica"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Uredi ladjedelnico"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Dók"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Uredi dók"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Jez"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Uredi jez"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Vodna točka"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr ""
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Pomol"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Uredi pomol"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr ""
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Slap"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Uredi slap"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Obračališče"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr ""
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Pomol"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Uredi pomol"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr ""
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr ""
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23643,16 +23981,38 @@
 msgstr ""
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Ladjedelnica"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Uredi ladjedelnico"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Dók"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Uredi dók"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Železniški tir"
@@ -23660,5 +24020,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -23688,7 +24048,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23704,8 +24064,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23719,29 +24079,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23754,8 +24114,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23826,8 +24186,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23839,8 +24199,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr ""
@@ -23853,8 +24213,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23867,23 +24227,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Tir ozkotirne železnice"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Uredi tir ozkotirne železnice"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr ""
@@ -23891,50 +24251,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Podzemna"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Uredi podzemno"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr ""
@@ -23942,5 +24302,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23949,10 +24309,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Nerabljen tir"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Uredi nerabljen tir"
@@ -23961,9 +24321,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -23972,5 +24332,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr ""
@@ -23979,5 +24339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr ""
@@ -23987,5 +24347,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -23993,5 +24353,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Okretnica"
@@ -24000,5 +24360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24007,10 +24367,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -24018,10 +24378,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -24029,10 +24389,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -24040,10 +24400,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24051,10 +24411,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24063,5 +24424,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24069,5 +24430,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24076,5 +24437,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24082,5 +24443,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Gorivo"
@@ -24090,69 +24451,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "Kopno"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24169,34 +24552,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24204,37 +24588,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24255,33 +24650,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24290,170 +24687,189 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+msgid "With shop"
+msgstr ""
+
+#: build/trans_presets.java:1359
+msgid "convenience"
+msgstr ""
+
+#: build/trans_presets.java:1359
+msgid "kiosk"
+msgstr ""
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24461,4 +24877,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24470,6 +24887,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkirišče"
@@ -24478,5 +24895,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -24487,25 +24904,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24514,54 +24933,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr ""
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr ""
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr ""
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "da"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Uredi drevo"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Kontaktiraj {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -24570,10 +25133,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr ""
@@ -24581,17 +25143,74 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
+msgstr ""
+
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Uredi parkirišče"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr ""
+
+#: build/trans_presets.java:1459
+msgid "Motorcycle Dealer"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Uredi avtocesto"
+
+#: build/trans_presets.java:1467
+msgid "Services:"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Shrani"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "Kopno"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Prednastavitve"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
 msgstr ""
 
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr ""
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
 msgstr ""
 
@@ -24599,10 +25218,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24612,5 +25231,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24618,5 +25237,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr ""
@@ -24624,5 +25243,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -24630,5 +25249,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -24636,5 +25255,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr ""
@@ -24643,5 +25262,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr ""
@@ -24649,5 +25268,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -24656,5 +25275,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -24666,5 +25285,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -24672,10 +25291,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -24684,10 +25303,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr ""
@@ -24696,5 +25315,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -24703,5 +25322,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -24709,5 +25328,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -24717,13 +25336,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr ""
@@ -24731,19 +25349,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Klopca"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -24751,5 +25369,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taksi"
@@ -24757,5 +25375,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -24763,10 +25381,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Letališče"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24774,5 +25392,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24780,10 +25398,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr ""
@@ -24792,5 +25410,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24798,5 +25416,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24804,5 +25422,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24810,5 +25428,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24816,5 +25434,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24822,5 +25440,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24830,5 +25448,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24838,5 +25456,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24847,6 +25465,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr ""
@@ -24856,5 +25474,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24863,5 +25481,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24869,5 +25487,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24875,15 +25493,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -24895,5 +25513,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -24902,5 +25520,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr ""
@@ -24913,8 +25531,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr ""
@@ -24938,34 +25556,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -24979,168 +25597,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr ""
@@ -25148,20 +25671,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr ""
@@ -25169,10 +25692,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr ""
@@ -25180,30 +25703,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr ""
@@ -25211,10 +25735,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -25225,5 +25749,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -25231,5 +25755,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr ""
@@ -25237,5 +25761,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr ""
@@ -25243,79 +25769,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr ""
@@ -25323,18 +25849,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25342,10 +25868,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr ""
@@ -25353,10 +25879,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr ""
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pivnica"
@@ -25364,20 +25895,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25385,10 +25916,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr ""
@@ -25396,25 +25927,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Muzej"
@@ -25422,9 +25953,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -25433,9 +25964,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr ""
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr ""
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Umetnina"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Uredi umetnino"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -25443,50 +25995,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr ""
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr ""
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Umetnina"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Uredi umetnino"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr ""
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr ""
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25524,5 +26077,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25530,28 +26083,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25561,5 +26114,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25567,5 +26120,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr ""
@@ -25573,6 +26126,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -25580,5 +26133,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25586,6 +26139,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Smučanje"
@@ -25593,5 +26146,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25599,46 +26152,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25647,5 +26200,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25653,55 +26206,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr ""
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr ""
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Grad"
@@ -25710,19 +26242,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -25731,9 +26263,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr ""
@@ -25741,10 +26273,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25752,5 +26284,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25758,15 +26290,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr ""
@@ -25774,55 +26306,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Igrišče"
@@ -25830,35 +26362,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -25872,6 +26404,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -26287,6 +26819,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26321,240 +26853,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr ""
@@ -26571,5 +27103,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26596,23 +27127,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "vrsta"
@@ -26629,5 +27168,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26654,211 +27192,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr ""
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -26866,52 +27407,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Strelišče"
@@ -26919,204 +27460,269 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "šport"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Uredi avtocesto"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Pozor"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Uredi parkirišče"
+
+#: build/trans_presets.java:2461
+msgid "Motocross"
+msgstr ""
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Uredi avtocesto"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Uredi čistilnico"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Uredi golf igrišče"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Avtomobil"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Uredi kabinsko žičnico"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Zgradba"
@@ -27124,5 +27730,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -27130,10 +27736,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -27141,10 +27747,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -27152,10 +27758,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -27164,10 +27770,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Zapor"
@@ -27176,10 +27782,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Policijska postaja"
@@ -27189,10 +27795,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -27201,10 +27807,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Pošta"
@@ -27212,5 +27818,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -27218,15 +27824,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Šola"
@@ -27234,10 +27840,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr ""
@@ -27245,10 +27851,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr ""
@@ -27256,5 +27862,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr ""
@@ -27262,5 +27868,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -27269,10 +27875,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Knjižnica"
@@ -27281,9 +27887,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr ""
@@ -27291,10 +27897,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Gledališče"
@@ -27303,10 +27909,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -27316,5 +27922,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -27323,6 +27929,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Vera"
@@ -27331,66 +27937,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr ""
@@ -27399,189 +28005,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Naslovi"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Urejanje podatkov o naslovu"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Ime ceste"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr ""
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Poštna številka"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Uredi interpolacijo naslovov"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr ""
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr ""
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27589,25 +28125,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -27615,10 +28151,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -27626,10 +28162,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -27638,41 +28174,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -27682,10 +28218,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Žerjav"
@@ -27693,5 +28229,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
@@ -27699,10 +28235,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -27710,10 +28246,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -27721,23 +28257,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr ""
@@ -27747,35 +28283,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr ""
@@ -27784,10 +28320,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr ""
@@ -27796,5 +28332,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27802,10 +28338,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -27816,23 +28352,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr ""
@@ -27841,20 +28377,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27862,55 +28398,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Stranišča"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -27919,5 +28455,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -27925,5 +28461,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Kovanci"
@@ -27931,5 +28467,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Bankovci"
@@ -27937,5 +28473,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27943,5 +28479,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -27949,15 +28485,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -27966,5 +28502,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -27972,35 +28508,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr ""
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28008,5 +28539,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28015,31 +28546,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28118,5 +28649,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28126,31 +28657,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28158,31 +28689,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr ""
@@ -28191,10 +28722,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -28203,10 +28734,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28215,5 +28746,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28221,120 +28752,218 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+msgid "Food"
+msgstr ""
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr ""
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr ""
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr ""
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Mesar"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Uredi mesarja"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Pekarna"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Uredi pekarno"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr ""
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr ""
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr ""
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr ""
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr ""
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr ""
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr ""
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr ""
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Mesar"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Uredi mesarja"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Pekarna"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Uredi pekarno"
-
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr ""
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr ""
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr ""
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Uredu avtobusno postajališče"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Čistilnica"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Uredi čistilnico"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Pralnica"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Uredi pralnico"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Železniški tir"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Uredi železniški tir"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2970
 msgid "Florist"
 msgstr ""
@@ -28342,73 +28971,9 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2972
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2977
 msgid "Garden Centre"
 msgstr ""
@@ -28416,9 +28981,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2979
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2984
 msgid "Hardware"
 msgstr ""
@@ -28426,9 +28991,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2986
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2991
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -28436,99 +29001,55 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2993
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:3004
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3005
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr ""
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr ""
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Čistilnica"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Uredi čistilnico"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Pralnica"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Uredi pralnico"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr ""
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -28536,5 +29057,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -28542,97 +29063,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Banka"
@@ -28640,14 +29161,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -28655,5 +29176,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -28661,15 +29182,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr ""
@@ -28677,18 +29198,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -28696,5 +29217,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -28702,9 +29223,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -28712,10 +29233,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -28724,5 +29256,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28731,15 +29263,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28747,5 +29279,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr ""
@@ -28754,368 +29286,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Meje"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr ""
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr ""
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr ""
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr ""
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Kraji"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Država"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Uredi državo"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr ""
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr ""
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr ""
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr ""
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr ""
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr ""
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr ""
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr ""
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr ""
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr ""
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr ""
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr ""
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Vas"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Uredi vas"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Zaselek"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Vrh"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Uredi vrh"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr ""
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr ""
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr ""
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr ""
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr ""
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr ""
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Otok"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Uredi otok"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "Gledališče"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Drevo"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Uredi drevo"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr ""
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr ""
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr ""
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr ""
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr ""
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr ""
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Gozd"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Uredi gozdnata tla"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Naravni rezervat"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Uredi naravni rezervat"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr ""
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr ""
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Vrh"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Uredi vrh"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr ""
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr ""
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr ""
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr ""
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Meje"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr ""
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr ""
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr ""
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr ""
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Drevo"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Uredi drevo"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr ""
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr ""
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr ""
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr ""
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr ""
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr ""
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Gozd"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Uredi gozdnata tla"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Naravni rezervat"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Uredi naravni rezervat"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr ""
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr ""
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr ""
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr ""
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr ""
@@ -29124,45 +29662,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29170,25 +29708,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29196,10 +29734,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29207,20 +29745,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr ""
@@ -29228,5 +29766,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29234,15 +29772,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -29250,9 +29788,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr ""
@@ -29260,39 +29798,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -29300,15 +29838,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29316,52 +29854,182 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Informacije"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Naslovi"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Urejanje podatkov o naslovu"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr ""
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr ""
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Ime ceste"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr ""
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Poštna številka"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr ""
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+msgid "AT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "V"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "IT"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "J"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Uredi interpolacijo naslovov"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr ""
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr ""
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Spor"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Dodaj podatke o avtorstvu"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "slik"
 
 #. item "Relations/Multipolygon"
@@ -29369,5 +30037,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29379,5 +30047,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29385,5 +30053,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29391,5 +30059,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29400,5 +30068,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29406,36 +30074,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29443,5 +30111,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -29450,5 +30118,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29456,34 +30124,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr ""
@@ -29492,15 +30160,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr ""
@@ -29508,5 +30176,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29515,5 +30183,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29521,132 +30189,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr ""
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29714,5 +30271,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29722,9 +30279,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29738,10 +30295,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -29749,31 +30306,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -29782,30 +30339,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -33904,8 +34461,14 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Ohrani varnostne kopije datotek"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Vodna točka"
 
 #~ msgid "Move"
@@ -33975,7 +34538,4 @@
 #~ msgstr "E-pošta"
 
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontaktiraj {0}..."
-
 #~ msgid "Merging conflicts."
 #~ msgstr "Spori pri zlivanju"
@@ -33992,11 +34552,4 @@
 #~ msgid "GPS end: {0}"
 #~ msgstr "Konec GPS sledi: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "slik"
-#~ msgstr[1] "slika"
-#~ msgstr[2] "sliki"
-#~ msgstr[3] "slike"
 
 #~ msgid "{0} within the track."
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 22859)
+++ applications/editors/josm/i18n/po/sv.po	(revision 22863)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
 "PO-Revision-Date: 2010-06-07 08:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:15+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Varning"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap-redigeraren"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -238,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -277,5 +277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -300,5 +300,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -409,4 +409,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -424,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1049,5 +1050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1056,5 +1057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1067,5 +1068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1463,13 +1464,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1478,5 +1479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1484,9 +1485,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1494,5 +1495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1526,8 +1527,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1536,9 +1537,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1554,6 +1555,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1563,5 +1564,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1586,6 +1587,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Fel"
@@ -1747,5 +1748,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Nej, avbryt"
@@ -2036,5 +2037,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2505,5 +2506,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2547,9 +2548,9 @@
 "Säker på att du vill flytta dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2558,9 +2559,9 @@
 "nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2844,5 +2845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Sök"
@@ -3040,7 +3041,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3307,5 +3308,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3461,31 +3462,31 @@
 msgstr "Automatisk taggrättning"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3504,15 +3505,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Fel i konfigurationsfilen på raderna {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3521,5 +3522,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3528,5 +3529,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3535,5 +3536,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3542,5 +3543,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3548,5 +3549,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3555,5 +3556,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3562,5 +3563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3569,5 +3570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3576,10 +3577,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3699,5 +3700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3769,9 +3770,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3779,5 +3780,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3967,14 +3968,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "söder"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Gå direkt dit"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3999,9 +4019,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -4044,5 +4064,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "järnväg"
@@ -4063,5 +4083,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4316,69 +4336,69 @@
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4388,9 +4408,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4398,57 +4418,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Initierar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "Kontokort"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4458,9 +4487,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4474,9 +4503,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4598,23 +4628,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4705,5 +4735,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4711,17 +4741,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4731,25 +4761,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5144,4 +5174,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5224,4 +5255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5238,4 +5270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5309,5 +5342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5319,10 +5352,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "inget"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "alla"
@@ -5404,5 +5437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5414,5 +5447,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5447,17 +5480,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5465,15 +5498,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5481,10 +5514,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5496,5 +5529,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5506,5 +5539,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5648,5 +5681,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5759,5 +5792,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5765,5 +5798,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5771,5 +5804,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5777,5 +5810,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5783,5 +5816,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5790,5 +5823,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5796,5 +5829,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5802,5 +5835,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5808,24 +5841,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5846,5 +5879,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5869,37 +5902,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Ange den nya nodens koordinater."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Använd decimalgrader."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negativa värden avser västra/södra halvklotet."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Vänligen välj en korrekt latitud i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Vänligen välj en korrekt latitud i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Vänligen välj en korrekt longitud i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Vänligen välj en korrekt longitud i området -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Stäng dialogrutan och skapa en ny nod"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Stäng dialogrutan men skapa ingen nod"
@@ -5955,9 +5988,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Relationer"
@@ -6005,10 +6038,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -6028,37 +6061,37 @@
 msgstr "Öppna en urvalslista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Zooma till urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Zooma till valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6067,27 +6100,27 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Urval: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Lossa panelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6096,5 +6129,5 @@
 "vänstra verktygraden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
@@ -6371,13 +6404,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6489,4 +6522,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6505,6 +6542,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6522,8 +6557,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6534,4 +6576,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6546,33 +6594,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6596,12 +6633,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6673,10 +6720,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6706,8 +6757,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6770,6 +6817,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6822,4 +6867,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6884,32 +6941,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6918,6 +6983,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6926,24 +6993,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6958,82 +7015,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7114,155 +7171,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Namn"
@@ -7686,4 +7748,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<olika>"
@@ -8188,17 +8251,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8476,4 +8539,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8481,15 +8545,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Typ"
@@ -8508,16 +8572,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "okänd"
@@ -9087,5 +9151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9308,20 +9372,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Lager"
@@ -9768,5 +9832,63 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Namn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Längd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rutt, "
+msgstr[1] "{0} rutter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} sträckpunkt"
+msgstr[1] "{0} sträckpunkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9774,62 +9896,17 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "Namn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivning: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Längd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} rutt, "
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} sträckpunkt"
-msgstr[1] "{0} sträckpunkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9839,10 +9916,10 @@
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9853,7 +9930,7 @@
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9861,10 +9938,10 @@
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9872,10 +9949,10 @@
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9883,21 +9960,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9909,9 +9986,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9921,5 +9998,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9929,30 +10006,30 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9960,5 +10037,5 @@
 msgstr "Anpassa färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9967,5 +10044,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9974,18 +10051,18 @@
 msgstr "Välj en färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9995,23 +10072,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10454,15 +10531,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Ingen bild"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Hämtar {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11412,4 +11489,48 @@
 msgid "Voice recorder calibration"
 msgstr "Kalibrering av röstinspelare"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Inledningstid (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Nuvarande värde är ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "När man sparar, behåll backup-filer som slutar på ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11493,5 +11614,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Bil"
@@ -11510,16 +11631,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Cykel"
@@ -11553,12 +11674,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Fotgängare"
@@ -11821,18 +11942,18 @@
 msgstr "Förval (automatiskt satt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Aktivera inbyggda förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12151,26 +12272,18 @@
 msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12286,6 +12399,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "naturfenomen typ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12502,12 +12624,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Behåll backup-filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "När man sparar, behåll backup-filer som slutar på ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12687,5 +12801,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12694,49 +12808,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12746,15 +12860,15 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, 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:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12764,17 +12878,17 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13382,5 +13496,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13478,5 +13592,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13485,5 +13599,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13552,5 +13666,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13560,10 +13674,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13571,5 +13685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13577,5 +13691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13583,10 +13697,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13594,5 +13708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13600,5 +13714,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13606,5 +13720,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13613,10 +13727,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13624,9 +13738,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13634,11 +13748,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13650,8 +13764,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13665,5 +13779,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13671,5 +13785,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13678,6 +13792,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13689,6 +13803,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13697,5 +13811,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13703,5 +13817,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13709,12 +13823,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13722,5 +13836,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13730,5 +13844,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13738,5 +13852,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13744,17 +13858,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14258,11 +14372,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14271,16 +14385,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14289,5 +14403,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14308,13 +14422,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Rapportera en bugg"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14323,9 +14437,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Oväntat undantag"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14333,5 +14447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14339,5 +14453,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14346,5 +14460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14352,9 +14466,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Texten finns redan i urklipp.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14551,5 +14665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14603,5 +14717,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14615,5 +14729,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14623,5 +14737,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14632,5 +14746,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tips: Du kan själv välja kortkommandon i inställningarna.)"
@@ -14731,5 +14845,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14815,10 +14929,61 @@
 msgstr "Skickar in spår till openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Öppettider"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Ändra egenskaper för upp till {0} objekt."
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Välj"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Karta: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Verktyg: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Hastighet:"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -14990,51 +15155,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Det går inte att lägga till en nod utanför världen."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Parametern \"{0}\" får inte vara null"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Parametern \"{0}\" får inte vara null"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -15133,16 +15300,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15156,5 +15315,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15267,5 +15426,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Byggnader"
@@ -15502,5 +15661,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15921,8 +16080,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16036,6 +16191,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Tomt lager"
@@ -17411,5 +17566,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Kollektivtrafik"
@@ -17453,48 +17608,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Vägpunkter"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "importerade data från {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "ändra urval"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "ändra vad som visas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "bekräfta alla fjärrstyrda handlingar manuellt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Inställningar för insticksmodulen Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17506,34 +17666,34 @@
 "applikationer i kommunikation med insticksmodulen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Bekräfta fjärrstyrd handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjärrstyrning har begärts för att hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17756,58 +17916,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Glidande karta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Hämta ruta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Hämta alla rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Öka zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Minska zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "automatisk zoomning"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "automatisk hämtning av rutor"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "GlidandeKarta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Inställningar för insticksprogrammet GlidandeKarta"
@@ -18096,11 +18256,10 @@
 msgstr "Husrad"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Redigera rörledning"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19182,5 +19341,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19302,59 +19461,59 @@
 msgstr "Överlappande sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19852,143 +20011,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "upp"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Ange ett användarnamn"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Stätta"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20008,7 +20164,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "flera"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20102,12 +20257,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Gör urval med angivet sökkriterium"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Vägpunkter"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20124,9 +20277,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Undantag inträffade"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20185,21 +20338,21 @@
 msgstr "Justera valt WMS-lagers läge"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20210,5 +20363,5 @@
 msgstr "Hämta WMS-ruta från {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20217,5 +20370,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20223,10 +20376,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20235,24 +20388,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20263,75 +20416,99 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 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:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Automatisk hämtning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil"
@@ -20401,8 +20578,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20896,16 +21072,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20913,5 +21094,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20919,5 +21100,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20926,5 +21107,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20933,10 +21114,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20944,15 +21125,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20962,5 +21143,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20971,10 +21152,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20983,5 +21164,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20990,15 +21171,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21008,15 +21189,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21025,5 +21206,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21032,5 +21213,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21039,10 +21220,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21051,5 +21232,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21059,5 +21240,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21066,20 +21247,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21088,5 +21269,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21128,4 +21309,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21158,10 +21340,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Vägar"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Vägar"
@@ -21172,5 +21354,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorväg"
@@ -21179,5 +21361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Redigera en motorväg"
@@ -21214,10 +21396,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referens"
@@ -21231,8 +21413,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Filer"
@@ -21251,13 +21433,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Största tillåtna hastighet (km/h)"
@@ -21291,17 +21473,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Enkelriktat"
@@ -21338,17 +21520,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21382,17 +21564,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -21423,17 +21605,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Skärning"
@@ -21464,17 +21646,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Bank"
@@ -21482,5 +21664,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Motorvägslänk"
@@ -21489,5 +21671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Redigera en motorvägslänk"
@@ -21495,5 +21677,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Stamväg"
@@ -21502,5 +21684,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Redigera en stamväg"
@@ -21510,6 +21692,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21517,5 +21699,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Stamvägslänk"
@@ -21524,5 +21706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Redigera en stamvägslänk"
@@ -21535,5 +21717,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primär"
@@ -21542,5 +21724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Redigera en primär väg"
@@ -21548,10 +21730,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Primärvägslänk"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Redigera en primärvägslänk"
@@ -21563,5 +21745,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Sekundär"
@@ -21571,5 +21753,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Redigera en sekundär väg"
@@ -21577,5 +21759,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Tertiär"
@@ -21585,5 +21767,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Redigera en tertiär väg"
@@ -21595,5 +21777,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Oklassificerad"
@@ -21603,5 +21785,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Redigera en oklassificerad väg"
@@ -21611,6 +21793,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21633,15 +21815,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
@@ -21653,5 +21835,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Bostadsområde"
@@ -21660,5 +21842,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Redigera en gata i bostadsområde"
@@ -21678,12 +21860,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Yta"
@@ -21705,166 +21887,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "belagd"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "obelagd"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "skog"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "kullersten"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "gräs"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr ""
@@ -21872,5 +22054,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Gårdsgata"
@@ -21879,5 +22061,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Redigera en gårdsgata"
@@ -21885,5 +22067,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Gågata"
@@ -21892,5 +22074,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Redigera en gågata"
@@ -21898,5 +22080,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Tillfartsväg"
@@ -21905,5 +22087,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Redigera en tillfartsväg"
@@ -21913,18 +22095,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Type av tillfartsväg"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "gränd"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "uppfart"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21932,5 +22114,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr ""
@@ -21940,10 +22122,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Väg (okänd typ)"
@@ -21952,5 +22134,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Redigera en väg av okänd typ"
@@ -21958,14 +22140,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Under byggnad"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Redigera en väg under byggnad"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Korsning"
@@ -21981,5 +22163,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "rondell"
@@ -21988,5 +22170,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Vägbegränsningar"
@@ -21995,15 +22177,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Redigera vägbegränsningar"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Betalstation"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Återvändsgränd"
@@ -22011,5 +22193,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr ""
@@ -22035,4 +22217,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22040,4 +22223,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22113,236 +22302,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privat"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "med tillåtelse"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "jordbruksfordon"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "nej"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "avsedd för"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privat"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "med tillåtelse"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "jordbruksfordon"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "nej"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "avsedd för"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Lätt lastbil"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung lastbil"
@@ -22357,10 +22553,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Häst"
@@ -22376,10 +22572,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -22394,19 +22591,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Bil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Allmänna transportmedel (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Minsta tillåtna hastighet (km/h)"
@@ -22414,20 +22611,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Största tillåtna vikt (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 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:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Största tillåtna bredd (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Största tillåtna längd (meter)"
@@ -22435,5 +22632,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Rondell"
@@ -22444,5 +22641,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Redigera en korsning"
@@ -22462,10 +22659,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorväg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "motorvägslänk"
@@ -22487,10 +22684,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "stamväg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "stamvägslänk"
@@ -22512,10 +22709,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primärväg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "primärvägslänk"
@@ -22537,5 +22734,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22550,9 +22747,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiärväg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "oklassificerad"
@@ -22566,9 +22763,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "bostadsgata"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "gårdsgata"
@@ -22612,10 +22809,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "tillfartsväg"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "buss_spårväg"
@@ -22645,5 +22842,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22655,10 +22852,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Redigera en bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Redigera en tunnel"
@@ -22666,10 +22863,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Stigar och småvägar"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Bruksväg"
@@ -22678,35 +22875,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Redigera en bruksväg"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22714,5 +22911,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Stig"
@@ -22721,76 +22918,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Redigera en stig"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Skidor"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Snöskoter"
@@ -22799,5 +22996,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22805,5 +23002,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Redigera en gång-/ridstig"
@@ -22811,5 +23008,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22827,11 +23024,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Redigera en cykelbana"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22839,5 +23036,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22845,5 +23042,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22851,5 +23048,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22858,5 +23055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Redigera en gångstig"
@@ -22864,5 +23061,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Trappsteg"
@@ -22872,10 +23069,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Redigera en trappa"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Motorvägskorsning"
@@ -22883,15 +23085,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Redigera en motorvägskorsning"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Tjänster"
@@ -22899,5 +23101,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr ""
@@ -22905,10 +23107,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22937,36 +23140,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operatör"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "bäck"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Redigera en restaurang"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Nödtelefon"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Trafikljus"
@@ -22976,5 +23200,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Typ av övergångsställe"
@@ -22983,27 +23207,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "obevakad"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "trafikljus"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "ö"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "utan markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Korsa ridande"
@@ -23011,6 +23235,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Korsa cyklande"
@@ -23019,11 +23243,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Brittiskt namn på övergångsställe"
@@ -23031,30 +23255,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "övergångsställe"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Stopp"
@@ -23062,67 +23286,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Övergångsställe för fotgängare"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Brittiskt typnamn"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Minirondell"
@@ -23133,14 +23295,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Riktning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "medurs"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Övergångsställe för fotgängare"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Brittiskt typnamn"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Vändplats"
@@ -23150,5 +23374,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Stadsgräns"
@@ -23156,15 +23380,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Redigera en stadsgränsskylt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Andra namn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Hastighetskamera"
@@ -23173,11 +23397,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Nödtelefon"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Lutning"
@@ -23185,5 +23404,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Brant lutning"
@@ -23191,5 +23410,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23199,10 +23418,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Vadställe"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Redigera ett vadställe"
@@ -23210,5 +23429,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Bergspass"
@@ -23216,5 +23435,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Redigera ett bergspass"
@@ -23223,10 +23442,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Höjd"
@@ -23234,5 +23453,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Hinder"
@@ -23240,5 +23459,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Trafikkon"
@@ -23246,5 +23465,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Redigera en trafikkon"
@@ -23289,16 +23508,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Tillåten trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23307,5 +23526,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr ""
@@ -23313,5 +23532,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Färist"
@@ -23319,10 +23538,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Redigera en färist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Bussfålla"
@@ -23330,15 +23549,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Spikhinder"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Redigera spikhinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Betalstation"
@@ -23346,5 +23565,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Redigera betalstation"
@@ -23352,10 +23571,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Gränskontroll"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Redigera en gränskontroll"
@@ -23364,5 +23583,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Häck"
@@ -23373,22 +23592,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Stängsel"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Mur"
@@ -23396,5 +23615,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Stadsmur"
@@ -23403,5 +23622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Stödmur"
@@ -23412,10 +23631,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Ingång"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Redigera en ingång"
@@ -23423,5 +23642,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Grind"
@@ -23429,50 +23648,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Redigera en grind"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Redigera en bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Redigera en taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Fösgrind"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Redigera en fösgrind"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Manshål"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Redigera ett manshål"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Stätta"
@@ -23480,25 +23699,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Redigera en stätta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Vändkors"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Redigera vändkors"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Utfallsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Redigera en utfallsport"
@@ -23506,25 +23725,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Vatten"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Källa"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Redigera en källa"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Avlopp"
@@ -23532,10 +23740,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Redigera en avloppsränna"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23543,10 +23751,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Bäck"
@@ -23554,10 +23762,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Redigera en bäck"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanal"
@@ -23565,10 +23773,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Redigera en kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Flod"
@@ -23578,59 +23786,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Redigera en flod"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Källa"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Redigera en källa"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Vattenfall"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Redigera ett vattenfall"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Överfallsdamm"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Redigera en överfallsdamm"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Damm"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Redigera en damm"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Hamnbassäng"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Redigera användning av mark för hamnbassäng"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Resevoar"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Redigera användning av mark för resevoar"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Täckt resevoar"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Redigera täckt resevoar"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Redigera vatten"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Redigera land"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Hamnbassäng"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Redigera användning av mark för hamnbassäng"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Resevoar"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Redigera användning av mark för resevoar"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Täckt resevoar"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Redigera täckt resevoar"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Kustlinje"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Redigera kustlinje"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Flodbank"
@@ -23639,10 +23901,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Redigera en flodbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Våtmark"
@@ -23653,14 +23916,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Redigera våtmark"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "träsk"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "mosse"
@@ -23674,35 +23937,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "kärr"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "vassbädd"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "saltäng"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "marskland"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "mangroveträsk"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Lera"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Redigera lera"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Strand"
@@ -23710,20 +23973,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Redigera strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Bukt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Redigera bukt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Stup"
@@ -23731,145 +23994,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Redigera stup"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Kustlinje"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Redigera kustlinje"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Handel"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Färjeterminal"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Redigera en färjeterminal"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Bil"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "nybörjare"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "cykel"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Färjelinje"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Redigera en färjelinje"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Varv"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Redigera ett varv"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Docka"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Redigera en docka"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Damm"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Redigera en damm"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Vattenpunkter"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Småbåtshamn"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Redigera en småbåtshamn"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Pir"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Redigera pir"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Slussport"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Överfallsdamm"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Redigera en överfallsdamm"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Vattenfall"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Redigera ett vattenfall"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Vändplats"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Småbåtshamn"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Redigera en småbåtshamn"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Pir"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Redigera pir"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Färjeterminal"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Redigera en färjeterminal"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Slip"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23879,16 +24213,38 @@
 msgstr "Redigera en slip"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Varv"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Redigera ett varv"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Docka"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Redigera en docka"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Järnväg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Järnväg"
@@ -23896,5 +24252,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Redigera en järnväg"
@@ -23924,7 +24280,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23940,8 +24296,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23955,29 +24311,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "bangård"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "sidospår"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "stickspår"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23990,8 +24346,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -24062,8 +24418,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24075,8 +24431,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Spänning"
@@ -24089,8 +24445,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -24103,23 +24459,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Smalspår"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Redigera en smalspårig järnväg"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Monorail"
@@ -24127,50 +24483,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Redigera en monorailbana"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Museijärnväg"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Redigera en museijärnväg"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Tunnelbana"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Redigera en tunnebana"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Spårvagn"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Redigera en spårväg"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Spårbussväg"
@@ -24178,5 +24534,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Redigera en spårbussväg"
@@ -24185,10 +24541,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Järnväg utan trafik"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Redigera en järnväg utan trafik"
@@ -24197,9 +24553,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Valfria typer"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Nedlagd järnväg"
@@ -24208,5 +24564,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Plankorsning"
@@ -24215,5 +24571,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Järnvägsövergång"
@@ -24223,5 +24579,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Typ av övergångsställe"
@@ -24229,5 +24585,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Vändskiva"
@@ -24236,5 +24592,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24243,10 +24599,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Linbana"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Stollift"
@@ -24254,10 +24610,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Redigera en stollift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Släplift"
@@ -24265,10 +24621,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Redigera en släplift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Linbana"
@@ -24276,10 +24632,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Redigera linbana"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24287,10 +24643,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24299,5 +24656,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24305,5 +24662,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24312,5 +24669,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24318,5 +24675,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Bränsle"
@@ -24326,69 +24683,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Redigera bränsle"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "land"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24405,34 +24784,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24440,37 +24820,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Öppettider"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24491,33 +24882,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24526,170 +24919,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "affär"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Närköp"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24697,4 +25112,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24706,6 +25122,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkeringsplats"
@@ -24714,5 +25130,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Redigera en parkeringsplats"
@@ -24723,25 +25139,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referensnummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "flervånings-"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "ytbeläggning"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24750,54 +25168,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Avgift"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Handikappplatser"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Biltvätt"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Redigera en biltvätt"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Redigera bilförsäljare"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Bilverkstad"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Redigera en bilverkstad"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "ja"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Redigera ett träd"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Kontakta {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Uthyrning"
@@ -24806,10 +25368,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Redigera biluthyrning"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Bilpool"
@@ -24817,28 +25378,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Redigera bilpool"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Redigera en cykelparkering"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Kapacitet"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motorcykel"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Redigera en motorväg"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Tjänster"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Spara"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "land"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Snabbval"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Kläder"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Redigera en cykelparkering"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Kapacitet"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Redigera cykelaffär"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Redigera en cykeluthyrning"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24848,5 +25468,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24854,5 +25474,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-klassificering"
@@ -24860,5 +25480,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Järnvägshållplats"
@@ -24866,5 +25486,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Redigera hållplats"
@@ -24872,5 +25492,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Spårvagnshållplats"
@@ -24879,5 +25499,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Redigera spårvagnshållplats"
@@ -24885,5 +25505,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Plattform"
@@ -24892,5 +25512,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Redigera plattform"
@@ -24902,5 +25522,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Referens (spårnummer)"
@@ -24908,10 +25528,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Tunnelbaneingång"
@@ -24920,10 +25540,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Redigera tunnelbaneingång"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -24932,5 +25552,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Bussterminal"
@@ -24939,5 +25559,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Redigera en bussterminal"
@@ -24945,5 +25565,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Busshållplats"
@@ -24953,13 +25573,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Redigera en busshållplats"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Vindskydd"
@@ -24967,19 +25586,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Bänk"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -24987,5 +25606,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taxi"
@@ -24993,5 +25612,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Redigera en taxistation"
@@ -24999,10 +25618,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Flygplats"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -25010,5 +25629,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25016,10 +25635,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25028,5 +25647,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -25034,5 +25653,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -25040,5 +25659,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -25046,5 +25665,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -25052,5 +25671,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -25058,5 +25677,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -25066,5 +25685,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -25074,5 +25693,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -25083,6 +25702,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -25092,5 +25711,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25099,5 +25718,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -25105,5 +25724,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -25111,15 +25730,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Turism"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Logi"
@@ -25131,5 +25750,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -25138,5 +25757,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Redigera ett hotell"
@@ -25149,8 +25768,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stjärnor"
@@ -25174,34 +25793,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25215,168 +25834,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motell"
@@ -25384,20 +25908,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Fäbod"
@@ -25405,10 +25929,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -25416,30 +25940,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -25447,10 +25972,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -25461,5 +25986,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -25467,5 +25992,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
@@ -25473,5 +25998,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Kök"
@@ -25479,79 +26006,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -25559,18 +26086,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25578,10 +26105,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kafé"
@@ -25589,10 +26116,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25600,20 +26132,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25621,10 +26153,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -25632,25 +26164,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Museum"
@@ -25658,9 +26190,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Zoo"
@@ -25669,9 +26201,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Nöjespark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Redigera en nöjespark"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Konst"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Redigera konstverk"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -25679,50 +26232,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Nöjespark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Redigera en nöjespark"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Konst"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Redigera konstverk"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Redigera vindskydd"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Eldstad"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Picknickplats"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Redigera picknickplats"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25760,5 +26314,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25766,28 +26320,28 @@
 msgstr "gata"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25797,5 +26351,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Rutter visas för:"
@@ -25803,5 +26357,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -25809,6 +26363,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Cykling"
@@ -25816,5 +26370,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25822,6 +26376,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -25829,5 +26383,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25835,46 +26389,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Informationstavla"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "djurliv"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25883,5 +26437,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25889,55 +26443,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Redigera vindskydd"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Eldstad"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Picknickplats"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Redigera picknickplats"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Slott"
@@ -25946,19 +26479,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -25967,9 +26500,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -25977,10 +26510,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Paleografisk plats"
@@ -25988,5 +26521,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Redigera paleografisk plats"
@@ -25994,15 +26527,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -26010,55 +26543,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Lekplats"
@@ -26066,35 +26599,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Idrott"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -26108,6 +26641,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "välj sport:"
@@ -26523,6 +27056,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26557,240 +27090,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Plan"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Flera"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -26807,5 +27340,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26832,23 +27364,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "typ"
@@ -26865,5 +27405,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26890,211 +27429,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motorsport"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Redigera motorsport"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Simning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -27102,52 +27644,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Skytte"
@@ -27155,204 +27697,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basket"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motorsport"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Redigera motorsport"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Varning"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Redigera en parkeringsplats"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Bil"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Redigera motorsport"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Redigera skridskoåkning"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Redigera en gränskontroll"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Bil"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Redigera linbana"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Byggnad"
@@ -27360,5 +27968,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -27366,10 +27974,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Stadshus"
@@ -27377,10 +27985,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Ambassad"
@@ -27388,10 +27996,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Domstol"
@@ -27400,10 +28008,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Fängelse"
@@ -27412,10 +28020,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polisstation"
@@ -27425,10 +28033,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -27437,10 +28045,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postkontor"
@@ -27448,5 +28056,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -27454,15 +28062,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Skola"
@@ -27470,10 +28078,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Högskola/universitet"
@@ -27481,10 +28089,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Högskola"
@@ -27492,5 +28100,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -27498,5 +28106,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Biograf"
@@ -27505,10 +28113,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Bibliotek"
@@ -27517,9 +28125,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -27527,10 +28135,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Teater"
@@ -27539,10 +28147,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -27552,5 +28160,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -27559,6 +28167,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Religion"
@@ -27567,66 +28175,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Samfund"
@@ -27635,189 +28243,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunnimuslimer"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adresser"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Redigera adressinformation"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Husnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Husnamn"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Gatunamn"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Stadsnamn"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Postnummer"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Landskod"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Redigera adressinterpolation"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Numreringsschema"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "udda"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "jämn"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27825,25 +28363,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -27851,10 +28389,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -27862,10 +28400,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -27874,41 +28412,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "naturgas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Plats"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -27918,10 +28456,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Kran"
@@ -27929,5 +28467,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Redigera kran"
@@ -27935,10 +28473,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -27946,10 +28484,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -27957,23 +28495,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -27983,35 +28521,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "solkraft"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -28020,10 +28558,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -28032,5 +28570,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -28038,10 +28576,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -28052,23 +28590,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -28077,20 +28615,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28098,55 +28636,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -28155,5 +28693,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -28161,5 +28699,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Mynt"
@@ -28167,5 +28705,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Anteckningar"
@@ -28173,5 +28711,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -28179,5 +28717,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -28185,15 +28723,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Återvinning"
@@ -28202,5 +28740,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -28208,35 +28746,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Burkar"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Kläder"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28244,5 +28777,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28251,31 +28784,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28354,5 +28887,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28362,31 +28895,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -28394,31 +28927,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Fontän"
@@ -28427,10 +28960,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -28439,10 +28972,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28451,5 +28984,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28457,314 +28990,305 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
-msgid "Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Fotgängare"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Stormarknad"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Redigera stormarknad"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Närköp"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Redigera närköp"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Redigera kiosk"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "Slakteri"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Redigera slakteri"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Bageri"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Redigera bageri"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr ""
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Redigera alkoholbutik"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Drycker"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Redigera bilförsäljare"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Redigera cykelaffär"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Stormarknad"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Redigera stormarknad"
-
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2880
 msgid "Chemist"
 msgstr "Hygien"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2881
 msgid "Edit Chemist"
 msgstr "Redigera hygienbutik"
 
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Närköp"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Redigera närköp"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Redigera kiosk"
-
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Hårfrisör"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Redigera hårfrisör"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Redigera optiker"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Redigera datoraffär"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Skor"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Redigera skoaffär"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Friluftsliv"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Redigera affär för friluftsliv"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Redigera sportaffär"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Kemtvätt"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Redigera kemtvätt"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Tvätteri"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Redigera tvätteri"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "Järnväg"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Redigera en järnväg"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Dator"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Redigera datoraffär"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Elektronik"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Redigera elektronikaffär"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Redigera hifi-affär"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Videobutik"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Redigera videobutik"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Florist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Redigera florist"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Trädgårdscenter"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Redigera trädgårdscenter"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Järnvaror"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Redigera järnaffär"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Gör-det-själv-affär"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Redigera gör-det-själv-affär"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Möbler"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Redigera möbelaffär"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Kontorsmaterial"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Redigera pappershandel"
+
+#: build/trans_presets.java:3010
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:3011
 msgid "Edit Book Store"
 msgstr "Redigera bokhandel"
 
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:3016
 msgid "Travel Agency"
 msgstr "Resebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:3017
 msgid "Edit Travel Agency"
 msgstr "Redigera resebyrå"
 
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "Slakteri"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Redigera slakteri"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Bageri"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Redigera bageri"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Florist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Redigera florist"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Redigera alkoholbutik"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Drycker"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Dator"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Redigera datoraffär"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Elektronik"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Redigera elektronikaffär"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Redigera hifi-affär"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Möbler"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Redigera möbelaffär"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Trädgårdscenter"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Redigera trädgårdscenter"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Järnvaror"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Redigera järnaffär"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Gör-det-själv-affär"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Redigera gör-det-själv-affär"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Kontorsmaterial"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Redigera pappershandel"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Hårfrisör"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Redigera hårfrisör"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Skor"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Redigera skoaffär"
-
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:3022
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3023
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Videobutik"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Redigera videobutik"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Kemtvätt"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Redigera kemtvätt"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Tvätteri"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Redigera tvätteri"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Friluftsliv"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Redigera affär för friluftsliv"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Redigera sportaffär"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Redigera optiker"
-
 #. <separator/>
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3029
 msgid "Vending machine"
 msgstr "Automat"
@@ -28772,5 +29296,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:3031
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -28778,97 +29302,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:3033
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3042
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:3045
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:3046
 msgid "Bank"
 msgstr "Bank"
@@ -28876,14 +29400,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3048
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:3055
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -28891,5 +29415,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3057
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -28897,15 +29421,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3064
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3069
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3070
 msgid "Doctors"
 msgstr "Läkare"
@@ -28913,18 +29437,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:3072
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3077
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:3078
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3083
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28932,5 +29456,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3085
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -28938,9 +29462,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3087
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3091
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -28948,10 +29472,21 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3093
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3097
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:3099
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr ""
@@ -28960,5 +29495,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28967,15 +29502,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -28983,5 +29518,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -28990,368 +29525,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Gränser"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Nationell"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Redigera nationsgränser"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Administrativ"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Redigera administrativa gränser"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Civilrättslig"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Redigera en civilrättslig gräns"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Politisk"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Redigera politiska gränser"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Nationalpark"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Redigera gräns för nationalpark"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Platser"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kontinent"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Land"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Redigera land"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Delstat"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Redigera delstat"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Region"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Redigera region"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Län"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Redigera län"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Stad"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Redigera stad"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Småstad"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Förort"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Mindre tätort"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Småort"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Plats"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Topp"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Redigera topp"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Glaciär"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Redigera en glaciär"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Vulkan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Redigera en vulkan"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Grottöppning"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Redigera en grottöppning"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Ö"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Redigera ö"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Holme"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Redigera holme"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "naturfenomen"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Träd"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Redigera ett träd"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botaniskt namn"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Naturskog"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Redigera naturskog"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "barrskog"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "lövskog"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "blandskog"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Kulturskog"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Redigera användning av mark för skogsbruk"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Naturreservat"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Redigera naturreservat"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Grottöppning"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Redigera en grottöppning"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Topp"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Redigera topp"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Glaciär"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Redigera en glaciär"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Vulkan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Redigera en vulkan"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Gränser"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Nationell"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Redigera nationsgränser"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Administrativ"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Redigera administrativa gränser"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Civilrättslig"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Redigera en civilrättslig gräns"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Politisk"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Redigera politiska gränser"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Nationalpark"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Redigera gräns för nationalpark"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Bergsluttning (med lösa stenar)"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Redigera bergssluttning (med lösa stenar)"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Höglandshed"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Redigera en höglandshed"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Buskage"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Redigera buskage"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Hed"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Redigera hed"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Träd"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Redigera ett träd"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botaniskt namn"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Naturskog"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Redigera naturskog"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "barrskog"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "lövskog"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "blandskog"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Kulturskog"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Redigera användning av mark för skogsbruk"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Naturreservat"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Redigera naturreservat"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Bergsluttning (med lösa stenar)"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Redigera bergssluttning (med lösa stenar)"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Buskage"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Redigera buskage"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Höglandshed"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Redigera en höglandshed"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Hed"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Redigera hed"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -29360,45 +29901,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Äng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -29406,25 +29947,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Gräs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Allmänning"
@@ -29432,10 +29973,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 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:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Allmänning"
@@ -29443,20 +29984,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -29464,5 +30005,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -29470,15 +30011,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 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:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -29486,9 +30027,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -29496,39 +30037,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 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:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -29536,15 +30077,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 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:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Militärt område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -29552,52 +30093,183 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 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:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Sevärdhet"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adresser"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Redigera adressinformation"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Husnummer"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Husnamn"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Gatunamn"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Stadsnamn"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Postnummer"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Landskod"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "Ö"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "S"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Redigera adressinterpolation"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Numreringsschema"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "udda"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "jämn"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Konflikt"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Lägg till information om upphovsman"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "Bild"
 
 #. item "Relations/Multipolygon"
@@ -29605,5 +30277,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -29615,5 +30287,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "yttre segement"
@@ -29621,5 +30293,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "inre segment"
@@ -29627,5 +30299,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29636,5 +30308,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29642,36 +30314,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29679,5 +30351,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -29686,5 +30358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29692,34 +30364,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -29728,15 +30400,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "till sträcka"
@@ -29744,5 +30416,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Rutt"
@@ -29751,5 +30423,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Redigera rutt"
@@ -29757,132 +30429,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Ruttyp"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "cykel"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29950,5 +30511,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29958,9 +30519,9 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29974,10 +30535,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -29985,31 +30546,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -30018,30 +30579,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34019,7 +34580,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34141,8 +34701,14 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Behåll backup-filer"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Vattenpunkter"
 
 #~ msgid "Move"
@@ -34168,7 +34734,4 @@
 #~ msgid "unnamed"
 #~ msgstr "namnlös"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
 
 #~ msgid "Select a bookmark first."
@@ -34252,7 +34815,4 @@
 #~ msgid "No data imported."
 #~ msgstr "Ingen data importerad."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakta {0}..."
 
 #~ msgid "Load Selection"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 22859)
+++ applications/editors/josm/i18n/po/tr.po	(revision 22863)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-14 00:56+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 00:00+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -77,5 +77,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -96,5 +96,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Uyarı"
@@ -124,9 +124,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editörü"
@@ -134,5 +134,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -275,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -298,5 +298,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -405,4 +405,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1040,5 +1041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1047,5 +1048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1437,13 +1438,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1452,5 +1453,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1458,9 +1459,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1468,5 +1469,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1500,8 +1501,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1510,9 +1511,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1528,6 +1529,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1537,5 +1538,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1560,6 +1561,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Hata"
@@ -1718,5 +1719,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr ""
@@ -1991,5 +1992,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2456,5 +2457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2495,9 +2496,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2506,9 +2507,9 @@
 "yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2768,5 +2769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Arama"
@@ -2959,7 +2960,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3223,5 +3224,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3377,31 +3378,31 @@
 msgstr "Otomatic etiket düzetmesi"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3420,15 +3421,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3437,5 +3438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3444,5 +3445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3451,5 +3452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3458,5 +3459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3464,5 +3465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3471,5 +3472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3478,5 +3479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3485,5 +3486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3492,10 +3493,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3615,5 +3616,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3685,9 +3686,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3695,5 +3696,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3880,14 +3881,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "güney"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+msgid "Hemisphere"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
 msgstr ""
 
@@ -3912,9 +3931,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3957,5 +3976,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "demiryolu"
@@ -3976,5 +3995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4228,69 +4247,69 @@
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Kutu ile belirlenen alanı ham gps olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4300,9 +4319,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4310,57 +4329,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Ayarlar Okunuyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#, fuzzy
+msgid "Discard"
+msgstr "ATM kartı"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4370,9 +4397,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4386,9 +4413,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4510,23 +4538,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "tabaka listede yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4617,5 +4645,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4623,17 +4651,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
+msgid "from tile"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
-msgid "from tile"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4643,25 +4671,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5056,4 +5084,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5136,4 +5165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5150,4 +5180,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5221,5 +5252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5231,10 +5262,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "boş"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "hepsi"
@@ -5316,5 +5347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5325,5 +5356,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5357,17 +5388,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5375,15 +5406,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+#. Strings in GTK ColorChooser
 #: ../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 ""
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5391,10 +5422,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5406,5 +5437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5416,5 +5447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr ""
@@ -5557,5 +5588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5668,5 +5699,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5674,5 +5705,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5680,5 +5711,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5686,5 +5717,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5692,5 +5723,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5699,5 +5730,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5705,5 +5736,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5711,5 +5742,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5717,24 +5748,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5755,5 +5786,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5778,37 +5809,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Yeni nokta için koordinat giriniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Ondalık derece kullan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatif sayılar Batı/Güney yarımküreyi gösterir ."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Lütfen -90..90 aralığında geçerli bir enlem değeri girin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Lütfen -90..90 aralığında bir enlem değeri girin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Lütfen -90..90 aralığında geçerli bir boylam değeri girin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Lütfen -90..90 aralığında bir boylam değeri girin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr ""
@@ -5864,9 +5895,9 @@
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "İlişkiler"
@@ -5914,10 +5945,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr ""
@@ -5937,37 +5968,37 @@
 msgstr "Seçim listesi penceresini aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Seçime yakınlaş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Seçili eleman(lara) yakınlaş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5976,32 +6007,32 @@
 msgstr "Seçim"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Seçim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Panelin kilidini Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "paneli büyütüp/küçültmek için tıklayınız"
@@ -6278,13 +6309,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
+msgid "Download now"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
-msgid "Download now"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
 msgstr ""
@@ -6396,4 +6427,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6412,6 +6447,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6429,8 +6462,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6441,4 +6481,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6453,33 +6499,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6503,12 +6538,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6580,10 +6625,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6613,8 +6662,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6677,6 +6722,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6729,4 +6772,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6791,32 +6846,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6825,6 +6888,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6833,24 +6898,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6865,82 +6920,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7021,155 +7076,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "İsim"
@@ -7593,4 +7653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<farklı>"
@@ -8093,17 +8154,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr ""
@@ -8378,4 +8439,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8383,15 +8445,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Tip"
@@ -8410,16 +8472,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "bilinmeyen"
@@ -8984,5 +9046,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9205,20 +9267,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Tabaka"
@@ -9665,5 +9727,61 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "İsim: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "Tanım: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "Uzunluk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rut, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} yol noktaları"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9671,60 +9789,16 @@
 msgstr "gps noktası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "İsim: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "Tanım: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "Uzunluk: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} rut, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} yol noktaları"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9734,10 +9808,10 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9748,7 +9822,7 @@
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9756,10 +9830,10 @@
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9767,10 +9841,10 @@
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9778,21 +9852,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9804,9 +9878,9 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 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:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9814,5 +9888,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9821,30 +9895,30 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Genel ayarları kullan."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Bu tabaka için çizgiler arasını birleştir."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Bu tabaka için çizgileri birleştirme."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Çizim seçeneklerini seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9852,5 +9926,5 @@
 msgstr "Renkleri Ayarla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9859,5 +9933,5 @@
 msgstr "Varsayılan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9866,18 +9940,18 @@
 msgstr "Renk seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "işaretli noktalardan imleçler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} isim verilen izler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Sesi içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -9887,23 +9961,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} daki ses imleçleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Görüntüleri içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10341,15 +10415,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Görüntü Yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Yükleniyor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11288,4 +11362,48 @@
 msgstr "Ses kayıt cihazı kalibrasyonu"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Lead-in zamanı (saniye)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Varsayılan değer ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Saklama sırasında backup dosyalarının sonuna ~ ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
@@ -11368,5 +11486,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Araba"
@@ -11385,16 +11503,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Bisiklet"
@@ -11428,12 +11546,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Ayak"
@@ -11682,18 +11800,18 @@
 msgstr "Varsayılan (Otomatik Seçilir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Önceden tanımlanmış ayarları etkinleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr ""
@@ -12010,26 +12128,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -12145,6 +12255,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "doğal tip {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12361,12 +12480,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Backup dosyalarını sakla"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Saklama sırasında backup dosyalarının sonuna ~ ekle"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12546,5 +12657,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12553,49 +12664,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Seçilebilen Özellikler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12605,15 +12716,15 @@
 msgstr "Etiketteki özellikler okunamadı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "İşleme Hatası {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12622,17 +12733,17 @@
 msgstr[0] "{0} Objeyi Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13240,5 +13351,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13336,5 +13447,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13343,5 +13454,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13410,5 +13521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13418,10 +13529,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13429,5 +13540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13435,5 +13546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13441,10 +13552,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13452,5 +13563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13458,5 +13569,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13464,5 +13575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13471,10 +13582,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ref=0, eksik <member> tanımı."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13482,9 +13593,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13492,11 +13603,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Geçersiz obje bulundu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13508,8 +13619,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13523,5 +13634,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13529,5 +13640,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13536,6 +13647,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13547,6 +13658,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13555,5 +13666,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13561,5 +13672,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13567,12 +13678,12 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
-#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13580,5 +13691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13588,5 +13699,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13596,5 +13707,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13602,17 +13713,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14113,11 +14224,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14126,16 +14237,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14144,5 +14255,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14163,13 +14274,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Birşey Yapma"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "hatayı Bildir"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14178,9 +14289,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Beklenmedik Durum"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14188,5 +14299,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14194,5 +14305,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14201,5 +14312,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14207,9 +14318,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Metin zaten panoda mevcut.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -14403,5 +14514,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14454,5 +14565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14465,5 +14576,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14473,5 +14584,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14482,5 +14593,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(İpucu: Kısayolları Tercihler Penceresinden Değiştirebilirisiniz.)"
@@ -14581,5 +14692,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr ""
@@ -14665,10 +14776,61 @@
 msgstr "İzleri openstreetmap.org sitesine yükle"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Açılış saati"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Değerleri {0} obje için değiştir"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Seç"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Harita: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Araç: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+msgid "Error in timeformat"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "Hız"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -14840,51 +15002,53 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+msgid "AlignWayS: Alignment not possible"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr "Dünya dışına bir kavşak ekleyemezsiniz."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr ""
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
 msgstr ""
 
@@ -14983,16 +15147,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15006,5 +15162,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr ""
@@ -15117,5 +15273,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Binalar"
@@ -15352,5 +15508,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15765,8 +15921,4 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr ""
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -15880,6 +16032,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Boş Tabaka"
@@ -17246,5 +17398,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Toplu taşıma"
@@ -17288,48 +17440,53 @@
 msgstr ""
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "Yol noktaları"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "API den veri yükle"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "veri burdan yüklendi {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "Seçimi değiştir"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "Görünüm yerini değiştir"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "Uzak kontol hareketlerini, manual kontrol et"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "JOSM un diğer uygulamalar tarafında kontrol edilmesini sağlayan API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Uzak Kontrol"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Uzak kontrol eklenti ayarları."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17340,34 +17497,34 @@
 "uygulamaların eklenti ile haberleşmesi için kullanılır."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Onaylanan Hareket"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Buna izin veriyormusunuz?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "uzak kontrol haereketini onayla"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "İstek Detayı: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17590,58 +17747,58 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Hareketli Harita"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Mozaik Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Bütün Mozaikleri Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgid "autozoom"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
-msgid "autozoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
@@ -17925,11 +18082,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Suboru hattı Düzenle"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19008,5 +19164,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr ""
@@ -19127,59 +19283,59 @@
 msgstr "Üstüste gelen yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
+msgid "Role verification problem"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#, java-format
+msgid "Role {0} unknown"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
-msgid "Role verification problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
-#, java-format
-msgid "Number of {0} roles too low ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
-#, java-format
-msgid "Number of {0} roles too high ({1})"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
-#, java-format
-msgid "Member for role {0} of wrong type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
-#, java-format
-msgid "Role {0} unknown"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
 msgid "Empty role found"
 msgstr ""
@@ -19667,143 +19823,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "yukarı"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Lütfen bir kullanıcı adı giriniz"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Stil"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19823,7 +19976,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "çoğul"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19917,12 +20069,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Yapılan aramaya göre seçim yap"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Yol noktaları"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -19939,9 +20089,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "İstisna oluştu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr ""
@@ -20000,21 +20150,21 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr ""
@@ -20025,5 +20175,5 @@
 msgstr "WMS mozaiği indir {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20032,5 +20182,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20038,10 +20188,10 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20050,24 +20200,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20078,17 +20228,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20097,58 +20247,82 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "WMS tabakasını dosyaya kaydet"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "WMS tabakasını dosyadan yükle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, 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:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Otomatik indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+msgid "Could not initialize remote control."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Veri yüklemek için boş bir WMS tabakası aç"
@@ -20217,8 +20391,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20712,16 +20885,21 @@
 msgstr ""
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20729,5 +20907,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20735,5 +20913,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20742,5 +20920,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20749,10 +20927,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20760,15 +20938,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20778,5 +20956,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20785,10 +20963,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20797,5 +20975,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20804,15 +20982,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20822,15 +21000,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20839,5 +21017,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20846,5 +21024,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20853,10 +21031,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20865,5 +21043,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20873,5 +21051,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20880,20 +21058,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20902,5 +21080,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20942,4 +21120,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -20972,10 +21151,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Sokaklar"
@@ -20986,5 +21165,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Araçyolu"
@@ -20993,5 +21172,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Araçyolunu düzenle"
@@ -21028,10 +21207,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Referans"
@@ -21045,8 +21224,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Şeritler"
@@ -21065,13 +21244,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Max. hız (km/sa)"
@@ -21105,17 +21284,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "TekYol"
@@ -21152,17 +21331,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21196,17 +21375,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Tunel"
@@ -21237,17 +21416,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Kesen"
@@ -21278,17 +21457,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "toprak set"
@@ -21296,5 +21475,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "Araç yolu hattı"
@@ -21303,5 +21482,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "araç yolu hattını düzenle"
@@ -21309,5 +21488,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Anayol"
@@ -21316,5 +21495,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Anayol düzenle"
@@ -21324,6 +21503,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr ""
@@ -21331,5 +21510,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "Anayol Hattı"
@@ -21338,5 +21517,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Anayol Hattı düzünle"
@@ -21349,5 +21528,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Birincil"
@@ -21356,5 +21535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Birincil yolu düzenle"
@@ -21362,10 +21541,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "Birincil hat"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Birincil hat düzenle"
@@ -21377,5 +21556,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "İkincil"
@@ -21385,5 +21564,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "İkincil yol düzenle"
@@ -21391,5 +21570,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Üçüncül"
@@ -21399,5 +21578,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Üçüncül yolu düzenle"
@@ -21409,5 +21588,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "tanzim edilmemiş"
@@ -21417,5 +21596,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Sınıflandırılmamış yolu düzenle"
@@ -21425,6 +21604,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21447,15 +21626,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr ""
@@ -21467,5 +21646,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "yerleşim alanı"
@@ -21474,5 +21653,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "yerleşim sokağını düzenle"
@@ -21492,12 +21671,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Yüzey"
@@ -21519,166 +21698,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "kaldırım"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "kaldırımsız"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "orman"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "parke taşı"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "Çakıl"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "ot"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "kum"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "toprak"
@@ -21686,5 +21865,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Canlı Sokak"
@@ -21693,5 +21872,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Living Street düzenle"
@@ -21699,5 +21878,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Yaya Yolu"
@@ -21706,5 +21885,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "yaya yol sokağını düzenle"
@@ -21712,5 +21891,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Servis"
@@ -21719,5 +21898,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Servis yolu düzenle"
@@ -21727,18 +21906,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr ""
@@ -21746,5 +21925,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Park alanı"
@@ -21754,10 +21933,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Park alanı düzenle"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "yol (tipi bilinmiyor)"
@@ -21766,5 +21945,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Tipi olmayan yolu düzenle"
@@ -21772,14 +21951,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "İnşaat"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Otoyolda onarım var olarak düzenle"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Kavşak"
@@ -21795,5 +21974,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "döner kavşak"
@@ -21802,5 +21981,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Yol kısıtlamaları"
@@ -21809,15 +21988,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Yol kısıtlamalarını düzenle"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "ücret"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Çıkış Yok"
@@ -21825,5 +22004,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Erişim"
@@ -21849,4 +22028,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -21854,4 +22034,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -21927,236 +22113,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "özel"
+
+#. 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "ihtiyari"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "tarımsal"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "hayır"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr ""
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-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:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "atanmış"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "özel"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "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:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "ihtiyari"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "tarımsal"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "hayır"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "atanmış"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "mallar"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ağır araç"
@@ -22171,10 +22364,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "AT"
@@ -22190,10 +22383,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Motosiklet"
@@ -22208,19 +22402,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "otomobil"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Toplu taşıma araçları"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Min. Hız (km/h)"
@@ -22228,20 +22422,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Max. ağırlık (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr ""
@@ -22249,5 +22443,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Döner Kavşak"
@@ -22258,5 +22452,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Kavşak Düzenle"
@@ -22276,10 +22470,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "araçyolu"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "otoyol_hat"
@@ -22301,10 +22495,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "ana_hat"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "anayol_hat"
@@ -22326,10 +22520,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "birincil"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "birincil_hat"
@@ -22351,5 +22545,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22364,9 +22558,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "üçüncül"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "sınıflandırılmamış"
@@ -22380,9 +22574,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "yerleşim_alanı"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "canlı_sokak"
@@ -22426,10 +22620,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "servis"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "otobüs_hattı"
@@ -22459,5 +22653,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22469,10 +22663,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Köprü Düzenle"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr ""
@@ -22480,10 +22674,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Yollar"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "İz"
@@ -22492,35 +22686,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "İz düzenle"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr ""
@@ -22528,5 +22722,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Yol"
@@ -22535,76 +22729,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Yol düzenle"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "Kayak"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "kar motosikleti"
@@ -22613,5 +22807,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22619,5 +22813,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "At yolu düzenle"
@@ -22625,5 +22819,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22641,11 +22835,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Bisiklet yolu düzenle"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr ""
@@ -22653,5 +22847,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22659,5 +22853,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22665,5 +22859,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr ""
@@ -22672,5 +22866,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Yürüyüş Yolu Düzenle"
@@ -22678,5 +22872,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "adımlar"
@@ -22686,10 +22880,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Uçuş adımları düzenle"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+msgid "Amount of Steps"
+msgstr ""
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Otoyol Kavşağı"
@@ -22697,15 +22896,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Otoyol Kavşağı birleştirme"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Numara"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Servis"
@@ -22713,5 +22912,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Sevis istasyonu düzenle"
@@ -22719,10 +22918,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -22751,36 +22951,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Operator"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "akış"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Restorant Düzenle"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Acil durum telefonu"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Trafik ışıkları"
@@ -22790,5 +23011,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -22797,27 +23018,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "kontrolsuz"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "ada"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -22825,6 +23046,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr ""
@@ -22833,11 +23054,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22845,30 +23066,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelikan"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Dur"
@@ -22876,67 +23097,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr ""
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr ""
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr ""
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr ""
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr ""
@@ -22947,14 +23106,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Dönme Daire"
@@ -22964,5 +23185,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "şehir sınırı"
@@ -22970,15 +23191,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "şehir sınırı düzenle"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "ikinci isim"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "hız kamerası"
@@ -22987,11 +23208,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Acil durum telefonu"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr ""
@@ -22999,5 +23215,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr ""
@@ -23005,5 +23221,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23013,10 +23229,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "sığ geçit"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "sığ geçit düzenle"
@@ -23024,5 +23240,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Dağ geçidi"
@@ -23030,5 +23246,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "dağ geçidi düzenle"
@@ -23037,10 +23253,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "yükseklik"
@@ -23048,5 +23264,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Bariyer"
@@ -23054,5 +23270,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "direk-iskele"
@@ -23060,5 +23276,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "direk-iskele düzenle"
@@ -23103,16 +23319,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "İzin verilen trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr ""
@@ -23121,5 +23337,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Blok"
@@ -23127,5 +23343,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Hayvan Kapısı"
@@ -23133,10 +23349,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Hayvan Kapısı Düzenle"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "otobüs geçidi"
@@ -23144,15 +23360,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "gişe"
@@ -23160,5 +23376,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "gişe  düzenle"
@@ -23166,10 +23382,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Sınır kontrol noktası"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Sınır kontrol noktası düzenle"
@@ -23178,5 +23394,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Çalı Çit"
@@ -23187,22 +23403,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Çit"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Duvar"
@@ -23210,5 +23426,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Şehir Duvarı"
@@ -23217,5 +23433,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "istinat duvarı"
@@ -23226,10 +23442,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Giriş"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Giriş düzenle"
@@ -23237,5 +23453,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Geçit"
@@ -23243,50 +23459,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Geçit Düzenle"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Kalkan geçit"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "kalkan geçit düzenle"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Hampshire Geçidi"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Geçidi Düzenle"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Hız engeli"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Hız engeli düzenle"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "geçit"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "geçit düzenle"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Stil"
@@ -23294,25 +23510,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Stil düzenle"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Çıkış Kapısı-asker"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Çıkış Kapısı-asker düzenle"
@@ -23320,25 +23536,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Su"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Spring"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Spring Düzenle"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "kanalizasyon"
@@ -23346,10 +23551,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "kanalizasyon düzenle"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23357,10 +23562,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "dere"
@@ -23368,10 +23573,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "dere düzenle"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Kanal"
@@ -23379,10 +23584,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Kanal düzenle"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "nehir"
@@ -23392,59 +23597,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "nehir düzenle"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Spring"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Spring Düzenle"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "şelale"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "şelale düzenle"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "bent"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "bent dünele"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Baraj"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Baraj düzenle"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "havza"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "havza kullanım düzenle"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Havuz"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Havuz Kullanımı Düzenle"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Kapalı Sarnıç"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Kapalı Sarnıç Düzenle"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Su Düzenle"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Kara"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Kara Düzenle"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "havza"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "havza kullanım düzenle"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Havuz"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Havuz Kullanımı Düzenle"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Kapalı Sarnıç"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Kapalı Sarnıç Düzenle"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Sahil Çizgisi"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Sahil Çizgisi Düzenle"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Nehirkenarı"
@@ -23453,10 +23712,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Nehirkenarı Düzenle"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "sulak alan"
@@ -23467,14 +23727,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "sulak alan düzenle"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "bataklık"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "kenef"
@@ -23488,35 +23748,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "batak"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "sazlık alan"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "çolak alan"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "gelgit alanı"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "bataklık ormanı"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Çamur"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Çamur Alan Düzenle"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Sahil"
@@ -23524,20 +23784,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Sahil Düzenle"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Koy"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "koy Düzenle"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Uçurum"
@@ -23545,145 +23805,215 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Uçurum Düzenle"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Sahil Çizgisi"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Sahil Çizgisi Düzenle"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Alışveriş"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Feribot Terminal"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Feribot Terminal düzenle"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Araba"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "Tabakaları aç"
+
+#: build/trans_presets.java:1112
+msgid "vehicle"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "bisiklet"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "feribot hat"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "feribot hat düzenle"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
+#: build/trans_presets.java:1124
+msgid "Marina"
 msgstr "Marina"
 
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
 msgstr "Marina düzenle"
 
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "iskele"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "iskele düzenle"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Baraj"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Baraj düzenle"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Su yolu noktası"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Kemer"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Kemer Düzenle"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Lock Gate"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "bent"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "bent dünele"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "şelale"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "şelale düzenle"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "dönüm noktası"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Marina"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Marina düzenle"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Kemer"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Kemer Düzenle"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Feribot Terminal"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Feribot Terminal düzenle"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Gemi Kızağı"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -23693,16 +24023,38 @@
 msgstr "Gemi Kızağı Düzenle"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Marina"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Marina düzenle"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "iskele"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "iskele düzenle"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Demiryolu"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Demiryolu"
@@ -23710,5 +24062,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Demiryolu düzenle"
@@ -23738,7 +24090,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr ""
@@ -23754,8 +24106,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr ""
@@ -23769,29 +24121,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "saha"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "yük boşaltma yeri"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "demiryolu hattı şube-kısa"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -23804,8 +24156,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr ""
@@ -23876,8 +24228,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -23889,8 +24241,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Voltaj"
@@ -23903,8 +24255,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23917,23 +24269,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "tek ray"
@@ -23941,50 +24293,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "tek ray düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Korunmuş"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Korunmuş demiryolu düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Hafif Ray"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Hafif Ray Düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Metro Düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Tramvay"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Tramvay Düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Otobüs Yolu"
@@ -23992,5 +24344,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Otobüs Yolu Düzenle"
@@ -23999,10 +24351,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Kullanılmayan Demiryolu"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Kullanılmayan Demiryolu Düzenle"
@@ -24011,9 +24363,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "seçmeli tipler"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Terkedilmiş demiryolu düzenle"
@@ -24022,5 +24374,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "hemzemin geçit"
@@ -24029,5 +24381,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "geçit"
@@ -24037,5 +24389,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr ""
@@ -24043,5 +24395,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "döner levha"
@@ -24050,5 +24402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24057,10 +24409,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "havayolu"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Teleski"
@@ -24068,10 +24420,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Teleski Düzenle"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Kayakçı Asansörü"
@@ -24079,10 +24431,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Kayakçı Asansörü Düzenle"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Hava tramvayı"
@@ -24090,10 +24442,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Hava tramvayı düzenle"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr ""
@@ -24101,10 +24453,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24113,5 +24466,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24119,5 +24472,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24126,5 +24479,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24132,5 +24485,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Yakıt"
@@ -24140,69 +24493,91 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Yakıt düzenle"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "yer"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+msgid "Independent"
+msgstr ""
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24219,34 +24594,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24254,37 +24630,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Açılış saati"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24305,33 +24692,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24340,170 +24729,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "alışveriş"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Bakkal"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Kiosk"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24511,4 +24922,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24520,6 +24932,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Park"
@@ -24528,5 +24940,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Park düzenle"
@@ -24537,25 +24949,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Referans Numarası"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "kat otoparkı"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "yüzey"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "yer altı"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24564,54 +24978,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Ücret"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Özürlü Alanı"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Yıkama"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Yıkama düzenle"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "araçlı alışveriş düzenle"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "tamirci"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "tamirci düzenle"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Evet"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Ağaç Düzenle"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Kontak {0}..."
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Telefon Numarası"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "araç kiralam"
@@ -24620,10 +25178,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "araç kiralam düzenle"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Paylaşım Alanı"
@@ -24631,28 +25188,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Araç Paylaşım alanı düzenle"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Bisiklet parkyeri düzenle"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "kapasite"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Motosiklet"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Araçyolunu düzenle"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Servis"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Kaydet"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "yer"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Ayarlanmış"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Kıyafet"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Bisiklet parkyeri düzenle"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "kapasite"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr ""
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "bisiklet kiralama düzenle"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -24662,5 +25278,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -24668,5 +25284,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-Referans"
@@ -24674,5 +25290,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Demiryolu sonu"
@@ -24680,5 +25296,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Son nokta düzenle"
@@ -24686,5 +25302,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Tramvay durağı"
@@ -24693,5 +25309,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "tramvay durağı düzenle"
@@ -24699,5 +25315,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Demiryolu platformu"
@@ -24706,5 +25322,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Demiryolu platformu düzenle"
@@ -24716,5 +25332,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "referans (iz numarası)"
@@ -24722,10 +25338,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Alan"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Metro Girişi"
@@ -24734,10 +25350,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Metro Girişi Düzenle"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -24746,5 +25362,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "otogar"
@@ -24753,5 +25369,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "otogar düzenle"
@@ -24759,5 +25375,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "otobüs durağı"
@@ -24767,13 +25383,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "otobüs durağı düzenle"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Sığınak"
@@ -24781,19 +25396,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "banket"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -24801,5 +25416,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Taksi"
@@ -24807,5 +25422,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "taksi istasyonu düzenle"
@@ -24813,10 +25428,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Havaalanı"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr ""
@@ -24824,5 +25439,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr ""
@@ -24830,10 +25445,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -24842,5 +25457,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr ""
@@ -24848,5 +25463,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr ""
@@ -24854,5 +25469,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr ""
@@ -24860,5 +25475,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr ""
@@ -24866,5 +25481,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr ""
@@ -24872,5 +25487,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr ""
@@ -24880,5 +25495,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr ""
@@ -24888,5 +25503,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr ""
@@ -24897,6 +25512,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Fener"
@@ -24906,5 +25521,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -24913,5 +25528,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -24919,5 +25534,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -24925,15 +25540,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -24945,5 +25560,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -24952,5 +25567,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Hotel Düzenle"
@@ -24963,8 +25578,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Stars"
@@ -24988,34 +25603,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25029,168 +25644,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Telefon Numarası"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Motel"
@@ -25198,20 +25718,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "kulübe"
@@ -25219,10 +25739,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Hostel"
@@ -25230,30 +25750,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -25261,10 +25782,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -25275,5 +25796,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25281,5 +25802,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
@@ -25287,5 +25808,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "lokanta"
@@ -25293,79 +25816,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25373,18 +25896,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25392,10 +25915,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Kafe"
@@ -25403,10 +25926,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Pub"
@@ -25414,20 +25942,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr ""
@@ -25435,10 +25963,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -25446,25 +25974,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Müse"
@@ -25472,9 +26000,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -25483,9 +26011,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Lunapark"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Lunapark Düzenle"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Sanatsal"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Sanatsal Düzenle"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -25493,50 +26042,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Lunapark"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Lunapark Düzenle"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Sanatsal"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Sanatsal Düzenle"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Sığınak Düzenle"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Mangal Alanı"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Piknik Alanı"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Piknik Alanı Düzenle"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25574,5 +26124,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25580,28 +26130,28 @@
 msgstr "sokak"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -25611,5 +26161,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -25617,5 +26167,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "gezme"
@@ -25623,6 +26173,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -25630,5 +26180,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -25636,6 +26186,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Kayak"
@@ -25643,5 +26193,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -25649,46 +26199,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -25697,5 +26247,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -25703,55 +26253,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr ""
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Sığınak Düzenle"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Mangal Alanı"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Piknik Alanı"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Piknik Alanı Düzenle"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "Kale"
@@ -25760,19 +26289,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -25781,9 +26310,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -25791,10 +26320,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -25802,5 +26331,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25808,15 +26337,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Anıt"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Abide"
@@ -25824,55 +26353,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -25880,35 +26409,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -25922,6 +26451,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -26337,6 +26866,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26371,240 +26900,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -26621,5 +27150,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -26646,23 +27174,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "tip"
@@ -26679,5 +27215,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -26704,211 +27239,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Motor Sporlar"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Motor Sporları Düzenle"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "patinaj"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -26916,52 +27454,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -26969,204 +27507,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Raket"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Motor Sporlar"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Motor Sporları Düzenle"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Uyarı"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Park düzenle"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "otomobil"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Motor Sporları Düzenle"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "patinaj düzenle"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Sınır kontrol noktası düzenle"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Araba"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Hava tramvayı düzenle"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Bina"
@@ -27174,5 +27778,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -27180,10 +27784,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "belediye binası"
@@ -27191,10 +27795,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -27202,10 +27806,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -27214,10 +27818,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "Hapishane"
@@ -27226,10 +27830,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Polis"
@@ -27239,10 +27843,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -27251,10 +27855,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Postane"
@@ -27262,5 +27866,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -27268,15 +27872,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Okul"
@@ -27284,10 +27888,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Universite"
@@ -27295,10 +27899,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "kolej"
@@ -27306,5 +27910,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -27312,5 +27916,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Sinema"
@@ -27319,10 +27923,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "kütüphane"
@@ -27331,9 +27935,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -27341,10 +27945,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -27353,10 +27957,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -27366,5 +27970,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -27373,6 +27977,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Din"
@@ -27381,66 +27985,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "mezhep"
@@ -27449,189 +28053,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "sunni"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Adres"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Adres Bilgileri Düzenle"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Ev no:"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Ev İsmi"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Sokak Adı"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Şehir Adı"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Posta Kodu"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Ülke Kodu"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Adres İnterpolasyon Düzenle"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Numara şeması"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "tek"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "çift"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Tesis"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Kule"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr ""
@@ -27639,25 +28173,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -27665,10 +28199,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -27676,10 +28210,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -27688,41 +28222,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "benzin"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -27732,10 +28266,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Vinç"
@@ -27743,5 +28277,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
@@ -27749,10 +28283,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -27760,10 +28294,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -27771,23 +28305,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -27797,35 +28331,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -27834,10 +28368,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -27846,5 +28380,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -27852,10 +28386,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -27866,23 +28400,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -27891,20 +28425,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27912,55 +28446,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Tuvalet"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Telefon"
@@ -27969,5 +28503,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -27975,5 +28509,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Madeni Para"
@@ -27981,5 +28515,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Notlar"
@@ -27987,5 +28521,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -27993,5 +28527,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -27999,15 +28533,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -28016,5 +28550,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -28022,35 +28556,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Kıyafet"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28058,5 +28587,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28065,31 +28594,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr ""
@@ -28168,5 +28697,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28176,31 +28705,31 @@
 msgstr "yeşil"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -28208,31 +28737,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Kaynak"
@@ -28241,10 +28770,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -28253,10 +28782,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr ""
@@ -28265,5 +28794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28271,501 +28800,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Ayak"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Supermarket"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Supermarket Düzenle"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Bakkal"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Bakkal Düzenle"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Kiosk"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Kiosk Düzenle"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "kasap"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "kasap düzenle"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "fırın"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "fırın düzenle"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr ""
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr ""
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr ""
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Dükkanlar"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "berber"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "berber düzenle"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr ""
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "araçlı alışveriş düzenle"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Dışortam"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Dış ortam dükkanları düzenle"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Kuru Temizleme"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Kuru Temizleme Düzenle"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Çamaşırhane"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Çamaşırhane Düzenle"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "demiryolu_üzeri"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Demiryolu düzenle"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "kendin-al-market"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "kendin-al-market düzenle"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Kahve Makinası"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Kahve Makinası Düzenle"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Ücretli Ürünler"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "toplu_taşıma_bileti"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "toplu_taşıma_hatları"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "Park_bileti"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "yiyecek"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "içecek"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "tatlı"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "sigara"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "fotoğraf"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "hayvan_besini"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "gazeteler"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "oyuncuklar"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "pullar"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-kart"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "telefon_kartı"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "bilet"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "kondom"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "tampon"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "dışkı_poşeti"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "hesap veya üyelik kartı"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Kasa"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Banka"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Banka düzenle"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "ATM"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Döviz Bürosu"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Döviz Bürosu Düzenle"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "ATM Düzenle"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Sağlık"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Doktor"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Doktor Düzenle"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Dişçi"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Dişçi Düzenle"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Eczane"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Eczane Düzenle"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "Dispenser"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Hastane"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Hastane Düzenle"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Dükkanlar"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr ""
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "araçlı alışveriş düzenle"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr ""
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Bisiklet dükkanı düzenle"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Supermarket"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Supermarket Düzenle"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Bakkal"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Bakkal Düzenle"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Kiosk"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Kiosk Düzenle"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "kasap"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "kasap düzenle"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "fırın"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "fırın düzenle"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "kendin-al-market"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "kendin-al-market düzenle"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "berber"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "berber düzenle"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr ""
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Kuru Temizleme"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Kuru Temizleme Düzenle"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Çamaşırhane"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Çamaşırhane Düzenle"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Dışortam"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Dış ortam dükkanları düzenle"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr ""
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Kahve Makinası"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Kahve Makinası Düzenle"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Ücretli Ürünler"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "toplu_taşıma_bileti"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "toplu_taşıma_hatları"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "Park_bileti"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "yiyecek"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "içecek"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "tatlı"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "sigara"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "fotoğraf"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "hayvan_besini"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "gazeteler"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "oyuncuklar"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "pullar"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-kart"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "telefon_kartı"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "bilet"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "kondom"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "tampon"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "dışkı_poşeti"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "hesap veya üyelik kartı"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Kasa"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Banka"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Banka düzenle"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "ATM"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Döviz Bürosu"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Döviz Bürosu Düzenle"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "ATM Düzenle"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Sağlık"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Doktor"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Doktor Düzenle"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Dişçi"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Dişçi Düzenle"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Eczane"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Eczane Düzenle"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "Dispenser"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Hastane"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Hastane Düzenle"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -28774,5 +29305,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -28781,15 +29312,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -28797,5 +29328,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -28804,368 +29335,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Belediye Sınırı"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Milli"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Ülke Sınırı Düzenle"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "İdari"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "İdari Sınırları Düzenle"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Sivil"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Sivil Sınırları Düzenle"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr ""
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Politik Sınır Düzenle"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr ""
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Milli Park Sınırı Düzenle"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Yerler"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Kıta"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Ülke"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "İl"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "İl Düzenle"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Bölge"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "vilayet"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "vilayet Düzenle"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Şehir"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Mahalle"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Banliyo"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Köy"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Mezra"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Semt"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Zirve"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Zirve Düzenle"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Buzul"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Buzul Düzenle"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Volkan"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Volkan Düzenle"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Mağara Girişi"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Mağara Girişi Düzenle"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Ada"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "doğa"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Ağaç"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Ağaç Düzenle"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Botannik İsim"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Orman"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Orman Düzenle"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "Kozalaklı Orman"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "yaprak düken orman"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "karışık"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "orman"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "orman kullanımı düzenle"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "korunacak doğa alanı"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "korunacak doğa alanı düzenle"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Mağara Girişi"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Mağara Girişi Düzenle"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Zirve"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Zirve Düzenle"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Buzul"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Buzul Düzenle"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Volkan"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Volkan Düzenle"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Belediye Sınırı"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Milli"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Ülke Sınırı Düzenle"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "İdari"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "İdari Sınırları Düzenle"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Sivil"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Sivil Sınırları Düzenle"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Politik Sınır Düzenle"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Milli Park Sınırı Düzenle"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Taşlık Alan"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Taşlık Alan Düzenle"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Dağ Eteği"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Dağ Eteği Kullanımı"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Çalılık"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Çalılık Düzenle"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Sağlıksız Ağaç"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Sağlıksız Ağaç Düzenle"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Ağaç"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Ağaç Düzenle"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Botannik İsim"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Orman"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Orman Düzenle"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "Kozalaklı Orman"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "yaprak düken orman"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "karışık"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "orman"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "orman kullanımı düzenle"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "korunacak doğa alanı"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "korunacak doğa alanı düzenle"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Taşlık Alan"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Taşlık Alan Düzenle"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Çalılık"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Çalılık Düzenle"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Dağ Eteği"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Dağ Eteği Kullanımı"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Sağlıksız Ağaç"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Sağlıksız Ağaç Düzenle"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -29174,45 +29711,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -29220,25 +29757,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Otlak"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -29246,10 +29783,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Genel"
@@ -29257,20 +29794,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -29278,5 +29815,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -29284,15 +29821,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -29300,9 +29837,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -29310,39 +29847,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Perakende"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -29350,15 +29887,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Askeri"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -29366,52 +29903,184 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "İlginç Yerler"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Adres"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Adres Bilgileri Düzenle"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Ev no:"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Ev İsmi"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Sokak Adı"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Şehir Adı"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Posta Kodu"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Ülke Kodu"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+msgid "CH"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "D"
+
+#: build/trans_presets.java:3504
+msgid "FR"
+msgstr ""
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "G"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Adres İnterpolasyon Düzenle"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Numara şeması"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "tek"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "çift"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Çelişki"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Yazar bilgisi ekle"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "görüntü"
 
 #. item "Relations/Multipolygon"
@@ -29419,5 +30088,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29429,5 +30098,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29435,5 +30104,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29441,5 +30110,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29450,5 +30119,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29456,36 +30125,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29493,5 +30162,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr ""
@@ -29500,5 +30169,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29506,34 +30175,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr ""
@@ -29542,15 +30211,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr ""
@@ -29558,5 +30227,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr ""
@@ -29565,5 +30234,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr ""
@@ -29571,132 +30240,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr ""
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "bisiklet"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -29764,5 +30322,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29772,9 +30330,9 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -29788,10 +30346,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -29799,31 +30357,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr ""
@@ -29832,30 +30390,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -33833,7 +34391,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -33955,8 +34512,14 @@
 msgstr "Sicilya - İtalya"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "Backup dosyalarını sakla"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Su yolu noktası"
 
 #~ msgid ""
@@ -34119,8 +34682,4 @@
 #~ msgid "current delta: {0}s"
 #~ msgstr "şu anki delta: {0}s"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "görüntü"
 
 #~ msgid "{0} within the track."
@@ -34372,7 +34931,4 @@
 #~ msgid "Load Selection"
 #~ msgstr "Seçili alanı yükle"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontak {0}..."
 
 #~ msgid "Could not read from URL: \"{0}\""
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 22859)
+++ applications/editors/josm/i18n/po/uk.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-18 09:22+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-23 09:03+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:15+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -95,5 +95,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "Попередження"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Редактор OpenStreetMap на Java"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -255,5 +255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -280,5 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -303,5 +303,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -414,4 +414,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -429,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1054,5 +1055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1061,5 +1062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1072,5 +1073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1487,13 +1488,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "Очистити"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr "Підтвердження Очищення"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1505,5 +1506,5 @@
 "до нього даних."
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1512,9 +1513,9 @@
 "Наступні залежні об’єкти будуть очищені<br> на додачу до виділених об’єктів:"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "Додати до виділення"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1524,5 +1525,5 @@
 "знищені.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "Очистит буфер Відміни/Повернення"
@@ -1556,8 +1557,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1566,9 +1567,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1584,6 +1585,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1593,5 +1594,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1616,6 +1617,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "Помилка"
@@ -1778,5 +1779,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "Ні, скасувати"
@@ -2076,5 +2077,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2572,5 +2573,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2615,9 +2616,9 @@
 "часто призводить до виникнення помилок. Дійсно перемістити їх ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Відпустіть кнопку миші для вибору об’єктів в прямокутнику."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2626,9 +2627,9 @@
 "об’єднання з найближчою точкою."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "Відпустіть кнопку миші, щоб зупинити обертання."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2916,5 +2917,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "Пошук"
@@ -3123,7 +3124,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3400,5 +3401,5 @@
 msgstr[2] "Перемістити {0} точок"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3559,16 +3560,16 @@
 msgstr "Автоматичне виправлення теґів"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr "Не можливо створити теку {0}, автозбереження буде відключене"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "Не можливо створити файл {0}, буде використане інше ім’я для файлу"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
@@ -3577,15 +3578,15 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "Не можливо вилучити старий резервний файл {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "Помилка під час створення резервної копії вилучаємого шару : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3604,15 +3605,15 @@
 msgstr "Неправильне значення довготи — ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Попередження: не зберігаються налаштування у ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Файл налаштувань спотворено; рядок  {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3623,5 +3624,5 @@
 "є каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3632,5 +3633,5 @@
 "каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3641,5 +3642,5 @@
 "каталог для налаштувань: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3650,5 +3651,5 @@
 "каталог для налаштувань: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3658,5 +3659,5 @@
 "налаштувань."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3667,5 +3668,5 @@
 "типовими налаштуваннями."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3676,5 +3677,5 @@
 "на файл з типовими налаштуваннями: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3685,5 +3686,5 @@
 "<br>{0}<br> та створено новий файл з типовими налаштуваннями.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3694,10 +3695,10 @@
 "налаштувань {0} на файл з типовими налаштуваннями."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Помилка: Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3825,5 +3826,5 @@
 msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3903,9 +3904,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Елемент з ідентифікатором =0 не може бути видимий."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3913,5 +3914,5 @@
 msgstr "Об’єднання неможливе, тому що частина елементів нові, а частина ні"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -4110,15 +4111,34 @@
 msgstr "Зона PUWG 2000 {0} (Польща)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарська проекція"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "Зона UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "Північ"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "південь"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "Перейти туди"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4142,9 +4162,9 @@
 msgstr "Гвіана RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr "Франція UTM (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr "Система координат UTM"
@@ -4187,5 +4207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "залізниця"
@@ -4206,5 +4226,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4463,30 +4483,30 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "використання"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "Показати цю довідку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "Стандартний аргумент геометрії unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "Завантажити ділянку в межах габаритного прямокутника"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 "Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4494,9 +4514,9 @@
 "Файл/Відкрити)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "Завантажити ділянку в межах габаритного прямокутника, як дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4504,33 +4524,33 @@
 "дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "Вибір з урахуванням пошуку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "Запуск у розгорнутому вигляді"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "Відновити типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "Встановити мову"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "системні налаштування Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "ШЛЯХ/ДО/ПАПКИ/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "Зміна папки для всіх налаштувань користувача"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4544,9 +4564,9 @@
 "виділеної пам’яті"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "приклади"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4556,5 +4576,5 @@
 "порядку."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4562,50 +4582,61 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "Ініціалізація"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "Оновлення втулків…"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "Встановлення оновлених втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "Завантаження ранніх втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "Типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "Створення головного вікна"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "Завантаження втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "Незбережені osm-дані"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "Відновити"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "Дебетові картки"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM знайнов незбережений шар {0} з osm-даними. Вони схожі на ті, що були "
 "перед останнім збоєм JOSM. Ви бажаєте відновити дані?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4614,5 +4645,5 @@
 "використовується."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4625,9 +4656,9 @@
 "більш старішу (сумісну з Java 5) версію JOSM.</li></ul>Більш докладно:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "Вийти з JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr "Продовжити, спробувати у будь-якому випадку"
@@ -4641,9 +4672,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4767,23 +4799,23 @@
 msgstr "Користувач:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "Шару немає в списку."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Шар ''{0}'' повинен бути в списку шарів"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "Метрична"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "Китайська"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "Імперська"
@@ -4881,5 +4913,5 @@
 msgstr "Клацніть, щоб закрити діалог і скасувати вилучення об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4889,17 +4921,17 @@
 "рівні масштабування.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "Масштаб:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "з квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "до квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4913,25 +4945,25 @@
 "вірні.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "Адреса квадрату:"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "Застосувати адресу квадрату"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "Будь ласка, введіть адресу квадрату"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "Поточне значення не є правильною адресою"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "Будь ласка, введіть індекс квадрату"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
@@ -5360,4 +5392,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5442,4 +5475,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5456,4 +5490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5528,5 +5563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5538,10 +5573,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "нічого"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "всі"
@@ -5624,5 +5659,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5635,5 +5670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5669,17 +5704,17 @@
 msgstr "Ще не розв’язаний"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "Роль:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "Введіть роль для всіх членів зв’язку"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "Позначте змінені зв’язки теґом "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5688,16 +5723,16 @@
 "<html>Позначте, який теґ буде призначений <br>всім зміненим зв’язкам.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "Ключ:"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Введіть ключ теґу, наприклад: <strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-"<html>Введіть ключ теґу, наприклад: <strong><tt>fixme</tt></strong></html>"
-
-#. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5705,5 +5740,5 @@
 msgstr "Значення:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5712,5 +5747,5 @@
 "strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5727,5 +5762,5 @@
 "того же зв’язку: нова лінія займає в зв’язку місце оригінальної лінії.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5742,5 +5777,5 @@
 "того же зв’язку: нова точка займає в зв’язку місце оригінальної точки.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "Застосувати цю роль всім членам зв’язку"
@@ -5889,5 +5924,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -6006,5 +6041,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -6012,5 +6047,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -6018,5 +6053,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -6024,5 +6059,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -6030,5 +6065,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -6037,5 +6072,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -6043,5 +6078,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -6049,5 +6084,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -6055,24 +6090,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фільтр активний</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> об’єктів приховано"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> об’єктів пошкоджено"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об’єкти.<p></html>"
@@ -6093,5 +6128,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -6116,37 +6151,37 @@
 msgstr "Розширена інформація про об’єкт"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "Введіть координати нової точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "Використовувати десяткові градуси"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Від’ємні значення вказують на Західну/Південну півкулі"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Будь ласка, введіть правильну широту в діапазоні -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Введіть широту в діапазоні -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Будь ласка, введіть правильну довготу в діапазоні -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Введіть довготу в діапазоні -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "Закрити діалог і створити нову точку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "Закрити діалог, не створюючи нову точку"
@@ -6202,9 +6237,9 @@
 msgstr "Інформація про шар"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "Зв’язки"
@@ -6252,10 +6287,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "Завантажити з сервер неповних членів вибраних зв’язків"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "Завантажити неповних членів"
@@ -6275,37 +6310,37 @@
 msgstr "Відкрити вікно зі списком виділених об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "Пошук об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "Наблизитися до виділеного"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "Наблизитися до виділених елементів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "Запустити редактор зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "Запустити редактор зв’язків для виділеного зв’язку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Вибрати зі списку зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Вибрати зв’язок зі списку зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6314,27 +6349,27 @@
 msgstr "Виділення"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Вибр.: Зв’яз.:{0} / Ліній:{1} / Точок:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "Вибір: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Отримати докладну інформацію про внутрішній стан об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "Перевірити"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "Відстикувати панелі"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6343,5 +6378,5 @@
 "лівій панелі."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Натисніть на для зменшення/збільшення вмісту панелі"
@@ -6633,13 +6668,13 @@
 msgstr "Нема до чого наближатись"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "Зміст цього набору змін ще не завантажено."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "Завантажити зараз"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "Завантажити вміст набору змін"
@@ -6751,4 +6786,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6767,6 +6806,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6784,8 +6821,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6796,4 +6840,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6808,33 +6858,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6858,12 +6897,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6935,10 +6984,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6968,8 +7021,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -7032,6 +7081,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -7084,4 +7131,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -7146,32 +7205,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -7180,6 +7247,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -7188,24 +7257,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -7220,82 +7279,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7376,155 +7435,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "Назва"
@@ -7992,4 +8056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<інший>"
@@ -8535,17 +8600,17 @@
 "Помилка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "в тому числі безпосередні нащадки батьківських зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "Завантажити батьківські зв’язки"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "Завантаження батьківських зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "Правити поточний зв’язок"
@@ -8834,4 +8899,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8839,15 +8905,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "Тип"
@@ -8866,16 +8932,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "Невідомо"
@@ -9508,5 +9574,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "Відкрити діалог вибору файлу"
@@ -9768,20 +9834,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "Рівень"
@@ -10295,11 +10361,6 @@
 msgstr[2] "Вилучити {0} об’єктів:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
-msgid "gps point"
-msgstr "точка GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10307,5 +10368,6 @@
 msgstr "Назва: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10313,5 +10375,5 @@
 msgstr "Опис: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #, java-format
 msgid "{0} track"
@@ -10322,23 +10384,26 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
+#: build/trans_presets.java:3585
 msgid "Description"
 msgstr "Опис"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 msgid "Timespan"
 msgstr "Період"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "Length"
 msgstr "Довжина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
 msgstr "Довжина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #, java-format
 msgid "{0} route, "
@@ -10348,18 +10413,33 @@
 msgstr[2] "{0} маршрутів, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "{0} waypoint"
 msgid_plural "{0} waypoints"
-msgstr[0] "{0} точка маршруту"
-msgstr[1] "{0} точки маршруту"
-msgstr[2] "{0} точок маршруту"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+msgstr[0] "{0} маршрутна точка"
+msgstr[1] "{0} маршрутні точки"
+msgstr[2] "{0} маршрутних точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr "точка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} трек"
+msgstr[1] "{0} треки"
+msgstr[2] "{0} треків"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Перетворити в шар даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10369,10 +10449,10 @@
 "вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -10383,7 +10463,7 @@
 msgstr "Перетворено з: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10391,10 +10471,10 @@
 msgstr "Завантажити з OSM дані уздовж цього треку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Завантажити всі в межах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10402,10 +10482,10 @@
 msgstr "{0} метрів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимальна ділянка для одного запиту:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10413,21 +10493,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "Завантажити біля:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "тільки треки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
-msgstr "тільки дорожні точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+msgstr "тільки маршрутні точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
-msgstr "треки та дорожні точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+msgstr "треки та маршрутні точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10439,50 +10519,50 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На шарі відсутній трек GPX, щоб накласти звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
 msgstr ""
-"Деякі точки створені до початку треку або після його закінчення і будуть "
-"пропущені або перенесені на початок треку."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+"Деякі маршрутні точки створені до початку треку або після його закінчення і "
+"будуть пропущені або перенесені на початок треку."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
 "time were omitted."
 msgstr ""
-"Деякі точки, які були занадто далеко від інших, були проігноровані при "
-"розрахунку часу."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+"Деякі маршрутні точки, які були занадто далеко від інших, були проігноровані "
+"при розрахунку часу."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "Налаштувати креслення ліній"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "Використовувати загальні налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "Креслити лінії між точками цього шару."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "Не креслити лінії між точками цього шару."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "Вибрати варіанти креслення ліній"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -10490,5 +10570,5 @@
 msgstr "Налаштувати колір"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -10497,5 +10577,5 @@
 msgstr "Типовий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -10504,18 +10584,18 @@
 msgstr "Вибрати колір"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "Позначки з іменованих точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Іменовані точки треку з {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "Імпортувати аудіо"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10527,23 +10607,23 @@
 "містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "Імпорт неможливий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудіофайли Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудіо позначки з {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "Імпорт зображень"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -11010,15 +11090,15 @@
 msgstr "Не можливо вилучити файл зображення"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "Немає зображень"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "Завантаження {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11966,9 +12046,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
-msgstr "Точні точки шляху з дійсними часовими відбитками."
+msgstr "Явні маршрутні точки з дійсними часовими відбитками."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
-msgstr "Точні точки шляху з орієнтовним часом з позиції на треку."
+msgstr "Явні маршрутні точки з орієнтовним часом з позиції на треку."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
@@ -12012,5 +12092,5 @@
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
-"Коли імпортується звук, застосовувати його для будь-яких шляхових точок із "
+"Коли імпортується звук, застосовувати його для будь-яких маршрутних точок із "
 "шару GPX."
 
@@ -12021,6 +12101,6 @@
 "waypoints) with names or descriptions."
 msgstr ""
-"Автоматично створювати звукові мітки з точок треку (замість точних точок "
-"шляху) з іменами або описами."
+"Автоматично створювати звукові мітки з точок треку (замість явних маршрутних "
+"точок) з іменами або описами."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
@@ -12072,4 +12152,48 @@
 msgid "Voice recorder calibration"
 msgstr "Калібрування звукозапису"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "Інтервал оновлення (у днях):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "Типове значення — ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "При збереженні, зберігати резервні копії з розширенням ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "Резервне копіювання файлів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "Вказати, чи будете ви створювати резервні файли"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -12154,5 +12278,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "Автомобіль"
@@ -12171,16 +12295,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "Велосипедом"
@@ -12214,12 +12338,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "Пішки"
@@ -12297,6 +12421,6 @@
 "layer."
 msgstr ""
-"Автоматично створювати шар міток з будь-яких точок шляху при відкритті GPX "
-"шару."
+"Автоматично створювати шар міток з будь-яких маршрутних точок при відкритті "
+"GPX шару."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
@@ -12390,9 +12514,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr "Дозволяє змінити маркування треку."
+msgstr "Дозволяє змінити маркування маршрутних точок треку."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Маркування дорожніх точок"
+msgstr "Маркування маршрутних точок"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
@@ -12481,18 +12605,18 @@
 msgstr "Типова (Автовизначення)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "Використовувати типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "Використовувати типові значки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "Використовується стиль"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "Стиль кольорів мапи"
@@ -12834,27 +12958,19 @@
 msgstr "Неможливо активувати проекцію {0}. Використовується проекція Меркатора"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "Автентифікація"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "Параметри проксі сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "Резервне копіювання файлів"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "Задати ваші дані і визначити спосіб ідентифікації на сервері OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "Вказати, чи використовуєте ви проксі-сервер"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "Вказати, чи будете ви створювати резервні файли"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -12971,6 +13087,15 @@
 "<br><br>Тонкощі (англ.):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "Зовнішні інструменти"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -13225,12 +13350,4 @@
 "Використовується метод «Базової автентифікації»."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "Зберігати резервні копії"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "При збереженні, зберігати резервні копії з розширенням ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -13435,5 +13552,5 @@
 msgstr "Додати новий теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -13444,49 +13561,49 @@
 "повинна бути такою ж, як і у values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Більш детальна інформація про цей елемент"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Невідомий запит: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "Доступні ролі"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "кількість"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "елементи"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "Необов’язкові атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Невідомий тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "Роль елемента заготовки без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "Вкладені елементи заготовок без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13496,15 +13613,15 @@
 msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Помилка синтаксичного аналізу: {0} "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи типу {0} підтримуються."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13515,17 +13632,17 @@
 msgstr[2] "Правка {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "Нічого не вибрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "Невдалий вибір!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "Застосувати заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -14173,5 +14290,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -14285,5 +14402,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -14292,5 +14409,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -14365,5 +14482,5 @@
 msgstr "Не існує файлу \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -14375,10 +14492,10 @@
 "minlat=''{1}'', maxlon=''{3}'', maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Знайдений XML-елемент <nd>, не є прямим нащадком елемента <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -14386,5 +14503,5 @@
 msgstr "Відсутній обов’язковий атрибут ''{0}'' у <nd> лінії {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -14392,5 +14509,5 @@
 msgstr "Невідповідне значення атрибуту ''ref'' елемента <nd>. Отримано {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -14398,5 +14515,5 @@
 msgstr "Вилучена лінія {0} містить точки"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
@@ -14404,5 +14521,5 @@
 "Знайдено XML-елемент <member>, що не є прямим нащадком елементу <relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -14410,5 +14527,5 @@
 msgstr "Відсутній атрибут ''ref'' у члена зв’язку {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -14417,5 +14534,5 @@
 "Неприпустиме значення атрибуту ''ref'' у члена зв’язку {0}. Отримано {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -14423,5 +14540,5 @@
 msgstr "Відсутній атрибут ''type'' у члена {0} в зв’язку {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -14432,10 +14549,10 @@
 "{2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неповна специфікація <member> з ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -14443,9 +14560,9 @@
 msgstr "Вилучений зв’язок {0} має підпорядкованих членів"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "Відсутні ключ або значення теґу"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -14453,11 +14570,11 @@
 msgstr "Невизначений елемент ''{0}'' знайдений у вхідному потоці. Пропущено."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Неприпустимий об’єкт з ід=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -14471,8 +14588,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -14488,5 +14605,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -14494,5 +14611,5 @@
 msgstr "Невідома чи непідтримувана версія API. Отримано {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -14501,6 +14618,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -14514,6 +14631,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -14522,5 +14639,5 @@
 msgstr "Неприпустиме значення для атрибуту ''changeset''. Отримано {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -14528,5 +14645,5 @@
 msgstr "Відсутній обов’язковий атрибут ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -14534,5 +14651,5 @@
 msgstr "Неприпустима довжина значення атрибуту ''{0}''. Отримано ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
@@ -14543,5 +14660,5 @@
 "зовнішнім ідентифікатором ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -14549,5 +14666,5 @@
 msgstr "Вилучена точка {0} є частиною лінії {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -14559,5 +14676,5 @@
 "відсутня у завантажених даних."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -14569,5 +14686,5 @@
 "зовнішнім ідентифікатором ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -14575,17 +14692,17 @@
 msgstr "Вилучений член {0} входить до складу зв’язку {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "Підготовка OSM-даних…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "Розбір даних OSM…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "Підготовка даних…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -15134,11 +15251,11 @@
 msgstr "Завантажити список втулків…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "Завантаження списоку втулків з ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -15149,16 +15266,16 @@
 "записати у кеш список втулків з сайту ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "Запис списку втулків в локальний кеш ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "Розбір списку втулків з сайту ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -15169,5 +15286,5 @@
 "Сайт пропущено. Помилка: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -15188,13 +15305,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "Нічого не робити"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "Повідомити про помилку"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -15205,9 +15322,9 @@
 "ви запускаєте останню<br>версію JOSM, будь ласка, надішліть звіт про помилку."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "Непередбачена помилка"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -15217,5 +15334,5 @@
 "переконайтеся, що у вас здійснено оновлення до останньої версії JOSM тут:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -15225,5 +15342,5 @@
 "ласка, повідомте про помилку на баг-трекері, використовуючи це посилання:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -15235,5 +15352,5 @@
 "це настільки детально, наскільки це можливо."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -15243,9 +15360,9 @@
 "URL:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Текст вже скопійовано у буфер обміну)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "Ви зіткнулися з помилкою в JOSM"
@@ -15498,5 +15615,5 @@
 "об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15557,5 +15674,5 @@
 msgstr "не використовується"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15568,5 +15685,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -15576,5 +15693,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -15585,5 +15702,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Підказка: Ви можете редагувати комбінації клавіш у вікні Опцій)"
@@ -15702,5 +15819,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "Видимість"
@@ -15786,10 +15903,62 @@
 msgstr "Надсилання треків на сайт openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "Години роботи"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "Зміна властивостей {0} об’єкта"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "Вибрати"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "Лінія {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "Інструмент: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "Помилка у фільтрі"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "відкритий"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "Вставка адрес"
@@ -15967,59 +16136,60 @@
 msgstr "Вирівнювання ліній"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"Ви не можете вирівняти, з’єднані відрізки.\n"
-"Будь ласка, оберіть два відрізки, що не мають спільних точок."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "повідомлення AlignWayS"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"Вирівнювання може привести до перенесення точок за межі світу.\n"
+"Ваші дії будуть відмінені."
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "Я готовий!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "Підказки AlignWays"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "Режим вирівнювання ліній"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "Вирівняти відрізок лінії"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "Параметр \"{0}\" не повинен бути пустим"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"Відрізок, положення якого треба впорядкувати, не може бути таким же як "
+"зразковий відрізок.\n"
+"Будь ласка, оберіть інший відрізок для впорядкування положення."
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
 msgstr "повідомлення AlignWayS"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"Вирівнювання може привести до перенесення точок за межі світу.\n"
-"Ваші дії будуть відмінені."
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "Я готовий!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "Підказки AlignWays"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "Режим вирівнювання ліній"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "Вирівняти відрізок лінії"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "Параметр \"{0}\" не повинен бути пустим"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"Відрізок, положення якого треба впорядкувати, не може бути таким же як "
-"зразковий відрізок.\n"
-"Будь ласка, оберіть інший відрізок для впорядкування положення."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -16176,28 +16346,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>Впорядкування відрізків.</b> Натисніть <b><i><span style=\"color:"
-"green\">Shift-A</span></i></b>. Також ви можете знайти команду в меню "
-"<b>Інструменти</b>\n"
-" або можете призначити назначить дію на <b>панель інструментів</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -16219,5 +16369,5 @@
 "\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "Більше не показувати"
@@ -16330,5 +16480,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "Будівлі"
@@ -16582,5 +16732,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -17027,8 +17177,4 @@
 msgstr "Схід"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "Північ"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -17149,6 +17295,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "Порожній шар"
@@ -17612,5 +17758,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 msgid "WayPoint Image"
-msgstr "Зображення з точки шляху"
+msgstr "Зображення з маршрутної точки"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
@@ -18541,5 +18687,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "Громадський транспорт"
@@ -18583,48 +18729,53 @@
 msgstr "Треки"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
-msgstr "Точки дороги"
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+msgstr "Маршрутні точки"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "завантажити дані з API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "імпортовано дані з {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "створити нові об’єкти"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "мінити виділення"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "змінити область перегляду на екрані"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr "отримувати версію протоколу"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "підтверджувати всі дії віддаленого управління вручну."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Втулок, що дозволяє іншим програмам керувати JOSM"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "Дистанційне керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "Налаштування втулка віддаленого керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18636,21 +18787,21 @@
 "сторонніх застосунків, що підключаються до втулка."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "Дозволені дії"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "Дозволити дію?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "Підтвердити дії Віддаленого керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "Втулок віддаленого управління отримав запит на створення нової точки."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18658,15 +18809,15 @@
 "посилання:"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Втулок віддаленого керування отримав запит на завантаження даних з API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "Деталі запиту: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -18894,58 +19045,58 @@
 msgstr "Вилучити непотрібні точки з ділянки."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "Рухома мапа"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "Автомасштабування"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "Завантажити квадрат мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "Показати дані квадрату"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "Завантажити всі квадрати мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "Збільшити масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "Зменшити масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "Прив’язатися до розміру квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "Очистити кеш квадратів мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "зображення "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "автомасштабування"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "автозавантаження квадратів"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "Рухома мапа"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "Налаштування втулка Рухома мапа."
@@ -19031,5 +19182,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
 msgid "Surveyor waypoint layer"
-msgstr "Інспектор шару точок шляху"
+msgstr "Інспектор шару маршрутних точок"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
@@ -19045,5 +19196,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
 msgid "Waypoint Description"
-msgstr "Опис точки шляху"
+msgstr "Опис маршртуної точки"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:25
@@ -19235,11 +19386,10 @@
 msgstr "Ряд будинків по вулиці"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "Правити Навігаційні Символи"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr "Правити OpenSeaMap"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr "Редактор Seamark"
@@ -20420,5 +20570,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "Мультиполігон"
@@ -20541,59 +20691,59 @@
 msgstr "Перетин ліній"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "Перевірка зв’язків:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "Цей втулок перевіряє зв’язки на наявність помилок."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "Тип зв’язку невідомий"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "Зв’язок порожній"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<порожньо>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "Відсутня роль {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "Проблеми перевірки ролі"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "Номер ролі {0} занизький ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "Номер ролі {0} зависокий ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "Помилковий тип члену ролі {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "Невідома роль {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "Знайдено порожню роль"
@@ -21082,144 +21232,140 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% трека GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Показати поточне положення у відео-фрагменті"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "Імпортувати відео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "Синхронізувати відео з цим треком GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "Вилучити відео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "вилучити поточне відео із шару"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "грати/пауза"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "починає/зупиняє відтворення відео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr "перемотати на n сек назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "лежачий поліцейський"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr "перейти"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+msgstr "перейти до введеного часу gps"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "Будь ласка, введіть індекс квадрату"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr "будь ласка, введіть GPS-час"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "вперед"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr "перемотати на n сек вперед"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "швидше"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "пришвидшене відтворення"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "повільніше"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "повільне відтворення"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "по кругу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr "зациклювати n сек біля поточної позиції"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "Утримувати в центрі"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "слідкувати за відео-позначкою автоматично"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "Перелаз"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr "Субтитри"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "Показати поточне положення у відео-фрагменті"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr "Показувати субтитри у відео"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "довжина переходу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr "Встановити довжину переходу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr "переміщатись по відео на х мсек"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Довжина циклу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "Встановити довжину циклу біля точки зациклювання"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr "без деінтерленсінгу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr "деінтерленсінг з подвоєнням ліній"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr "деінтерленсінгу з лінійною інтерполяцією"
@@ -21239,7 +21385,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "декілька"
+msgstr "вимкнути звук"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21347,16 +21492,15 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "Вибір з урахуванням пошуку"
+msgstr "Виберіть маршрутну точку для переміщення мапи"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "Точки дороги"
+msgstr "Пошук маршрутних точок"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
+"Пошук після маршрутної точки. Клацніть та потягніть мапу до маршрутної точки."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
@@ -21369,9 +21513,9 @@
 msgstr "Виберіть послідовність ліній, що не розгалужується"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "Сталась помилка."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "Не в кеші"
@@ -21432,21 +21576,21 @@
 msgstr "Скоригуйте положення обраного шару WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "Будь ласка, виберіть шар WMS для коригування."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "Вибрати шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "Початок коригування"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "Шар WMS для коригування відсутній"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "Відсутні шари для коригування"
@@ -21457,5 +21601,5 @@
 msgstr "Завантажити  квадрат WMS з {0}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -21466,5 +21610,5 @@
 "знаком '&' або '?'."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -21474,10 +21618,10 @@
 "перевірте Ваші налаштування."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "Попередження: Повне посилання: ''{0}''."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -21488,5 +21632,5 @@
 "Це може призвести до помилкових координат."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21495,19 +21639,19 @@
 "спотворене"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(відключено)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматичне завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -21522,17 +21666,17 @@
 "в будь-якому випадку?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "Так, отримати зображення"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "Невірний URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "Завантажити видимі квадрати мапи"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21541,58 +21685,83 @@
 "змініть розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "Змінити розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "Перезавантажити помилкові квадрати"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "Альфа-канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "Зберегти шар WMS у файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "Зберегти шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "Завантажити шар WMS з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "Завантажити шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "Помилка формату файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "Помилка завантаження файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "Встановити закладку WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "Автоматичне завантаження"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "Не можливо знайти об’єкт на мапі"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Відкрити порожній шар WMS завантаження даних з файлу"
@@ -21658,12 +21827,11 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
 msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
+msgstr "Дозволити дистанційне керування (потрібен втулок remotecontrol)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
-"Втулок віддаленого управління отримав запит на імпорт даних з наступного "
+"До Remote Control надійшов запит на завантаження WMS-шару із наступного "
 "посилання:"
 
@@ -22129,7 +22297,7 @@
 "the filename of an image."
 msgstr ""
-"Втулок для поєднання зображення з точками GPX треку. Поєднання буде "
-"вироблено, коли атрибут теґів 'name', 'cmt' або 'desc' шляхової точки, буде "
-"паруватись з ім’ям файлу зображення."
+"Втулок для поєднання зображень з маршрутними точками GPX треку. Поєднання "
+"буде здійснено, коли атрибут теґів 'name', 'cmt' або 'desc' маршрутної "
+"точки, буде паруватись з ім’ям файлу зображення."
 
 #. Plugin lakewalker
@@ -22187,16 +22355,21 @@
 "планшета, без переміщення миші (основна Java-планшет проблема)."
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "Показує тло OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Імпорт питань з OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22206,5 +22379,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22212,5 +22385,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22221,5 +22394,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22230,10 +22403,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Чудовий JGoodies Пластиковий Скін."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22242,15 +22415,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "Дозволяє іншим застосункам посилати команди JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "Втулок для відміни наборів змін"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22263,5 +22436,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22272,10 +22445,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "Надає можливості маршрутизації."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22287,5 +22460,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22296,15 +22469,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS ."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показує вікно для редагування теґів в табличному вигляді."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22317,15 +22490,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "Зробити ряд будинків по вулиці з одного блоку."
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Для створення та редагування навігаційних знаків для OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22337,5 +22510,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22346,5 +22519,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22355,10 +22528,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22369,5 +22542,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22380,5 +22553,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22389,20 +22562,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
+msgstr "Дозволяє пошук маршрутних точок імпортованих із файлу gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22413,5 +22586,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22455,4 +22628,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -22485,10 +22659,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "Дороги"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "Дороги"
@@ -22499,5 +22673,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автомагістраль"
@@ -22506,5 +22680,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "Властивості Автомагістралі"
@@ -22541,10 +22715,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "Позначення"
@@ -22558,8 +22732,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "Смуги"
@@ -22578,13 +22752,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "Макс. швидкість (км/г)"
@@ -22618,17 +22792,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "Односторонній рух"
@@ -22665,17 +22839,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -22709,17 +22883,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "Тунель"
@@ -22750,17 +22924,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "Виїмка"
@@ -22791,17 +22965,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "Насип"
@@ -22809,5 +22983,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "З’їзд з/на Автомагістраль"
@@ -22816,5 +22990,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "Властивості з’їзду з/на Автомагістраль"
@@ -22822,5 +22996,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "Шосе"
@@ -22829,5 +23003,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "Властивості Шосе"
@@ -22837,6 +23011,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "Автомагістраль"
@@ -22844,5 +23018,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "З’їзд з/на Шосе"
@@ -22851,5 +23025,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "Властивості з’їзду з/на Шосе"
@@ -22862,5 +23036,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Головна"
@@ -22869,5 +23043,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "Властивості Головної дороги"
@@ -22875,10 +23049,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "З’їзд з/на Головну"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "Властивості з’їзду з/на Головну дорогу"
@@ -22890,5 +23064,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Другорядна"
@@ -22898,5 +23072,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "Властивості Другорядної дороги"
@@ -22904,5 +23078,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "Третинна"
@@ -22912,5 +23086,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "Властивості Третинної дороги"
@@ -22922,5 +23096,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Не має класифікації"
@@ -22930,5 +23104,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "Властивості Дороги без класифікації"
@@ -22938,6 +23112,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "Місце роз’їзду"
@@ -22960,15 +23134,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -22980,5 +23154,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Місцевого значення"
@@ -22987,5 +23161,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "Властивості Місцевої вулиці"
@@ -23005,12 +23179,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "Поверхня"
@@ -23032,166 +23206,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "з покриттям"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "без покриття"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "асфальт"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "метал"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "ліс"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "дорожні_камені"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "бруківка"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "гравій"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "галька"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "утрамбоване"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "бруківка з травою"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "трава"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "пісок"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "грунт"
@@ -23199,5 +23373,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "Житлова зона"
@@ -23206,5 +23380,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "Властивості Житлової зони"
@@ -23212,5 +23386,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "Пішохідна зона"
@@ -23219,5 +23393,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "Властивості Пішохідної зони"
@@ -23225,5 +23399,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "Службовий проїзд"
@@ -23232,5 +23406,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "Властивості Службового проїзду"
@@ -23240,18 +23414,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "Тип Службового проїзду"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "провулок"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "під’їзна дорога"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "проїзд на стоянці"
@@ -23259,5 +23433,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "Проїзд на стоянці"
@@ -23267,10 +23441,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "Властивості Проїзду на стоянці"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип невідомий)"
@@ -23279,5 +23453,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "Властивості Дороги невідомого типу"
@@ -23285,14 +23459,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "Будується"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "Властивості Дороги, що будується"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "Перехрестя"
@@ -23308,5 +23482,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "Круг"
@@ -23315,5 +23489,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "Дорожні обмеження"
@@ -23322,15 +23496,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "Властивості Дорожніх обмежень"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "Платна"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "Глухий кут"
@@ -23338,5 +23512,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "Дозволи"
@@ -23362,4 +23536,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -23367,4 +23542,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -23440,236 +23621,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "приватна"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "дозволено власником"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "сільськогосподарського призначення"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "для транспорту лісництва"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "для доставки товарів"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "ні"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "Сільхоз рух"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "так"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "осн. призначення"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "приватна"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "місце призначення"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "дозволено власником"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "сільськогосподарського призначення"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "для транспорту лісництва"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "для доставки товарів"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "ні"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "Сільхоз рух"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "осн. призначення"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "офіційно"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "Вантажівка (до 3.5т)"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Вантажівка (більше 3.5т)"
@@ -23684,10 +23872,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "Конем"
@@ -23703,10 +23891,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -23721,19 +23910,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "Автомобіль"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "Громадський транспорт"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "Мін. швидкість (км/г)"
@@ -23741,20 +23930,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "Макс. вага (в тоннах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "Макс. висота (у метрах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "Макс. ширина (в метрах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "Макс. довжина (в метрах)"
@@ -23762,5 +23951,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "Круг"
@@ -23771,5 +23960,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "Властивості Перехрестя"
@@ -23789,10 +23978,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "автомагістраль"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "з’їзд з/на автомагістраль"
@@ -23814,10 +24003,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "шосе"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "з’їзд з/на шосе"
@@ -23839,10 +24028,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "головна дорога"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "з’їзд з/на головну"
@@ -23864,5 +24053,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -23877,9 +24066,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "третинна"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "дорога без класифікації"
@@ -23893,9 +24082,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "місцевого значення"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "жила зона"
@@ -23939,10 +24128,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "службова"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "моно-рейка"
@@ -23972,5 +24161,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -23982,10 +24171,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "Властивості Мосту"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "Властивості Тунелю"
@@ -23993,10 +24182,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "Шляхи"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "Ґрунтовка"
@@ -24005,35 +24194,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "Властивості Ґрунтовки"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "Дорожнє покриття"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "тип 1 (з покриттям)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "тип 2 (гравій, втрамбований ґрунт)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "тип 3 (гравій з піском (не втрамбований))"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "тип 4 (ґрунт)"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "тип 5 (пісок, трава)"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "Шкала для МотоБайків"
@@ -24041,5 +24230,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "Тропа"
@@ -24048,76 +24237,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "Властивості Тропи"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "Шкала SAC"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "пішохідна екскурсія"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "гірський туризм"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "гірське сходження"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "альпінізм"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr "скелелазіння"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr "скелелазіння з ускладненнями"
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "чудова"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "добра"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "середня"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "погана"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "жахлива"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "Інвалідним візком"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "На лижах"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "Снігоходом"
@@ -24126,5 +24315,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "Дорога для вершників"
@@ -24132,5 +24321,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "Властивості Дороги для вершників"
@@ -24138,5 +24327,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "Велодоріжка"
@@ -24154,11 +24343,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "Властивості Велодоріжки"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "Пішоходи"
@@ -24166,5 +24355,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "Розділені пішохідна і велодоріжка"
@@ -24172,5 +24361,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "Суміщені пішохідна і велодоріжка"
@@ -24178,5 +24367,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "Пішохідна доріжка"
@@ -24185,5 +24374,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "Властивості Пішохідної доріжки"
@@ -24191,5 +24380,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "Сходи"
@@ -24199,10 +24388,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "Властивості Сходів"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "Кількість місць"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "Магістральна розв’язка"
@@ -24210,15 +24405,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "Властивості Магістральної розв’язки"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "Придорожні послуги"
@@ -24226,5 +24421,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "Властивості Придорожніх послуг"
@@ -24232,10 +24427,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -24264,36 +24460,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "Оператор"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "Відновити"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "Властивості Ресторану"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "Телефон для екстрених викликів"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "Світлофор"
@@ -24303,5 +24520,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "Тип пішохідного переходу"
@@ -24310,27 +24527,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "нерегульований"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "регульований"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "острів"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "непозначений"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "Дозволено переїзд верхи"
@@ -24338,6 +24555,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "Дозволено переїзд велосипедом"
@@ -24346,11 +24563,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "Під наглядом регулювальника"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "Тип перехода (В.Британія)"
@@ -24358,30 +24575,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "zebra (нерегульований)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr "pelican (со світлофором)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr "toucan (вело-пішохідний зі світлофором)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr "puffin (зі світлофором з кнопкою)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr "pegasus (для вершників)"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr "tiger (нерегульований вело-пішохідний)"
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "Стоп"
@@ -24389,67 +24606,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "Пішохідний перехід"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "Властивості Пішохідного переходу"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "Назва типи (В.Брит)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "Засоби для обмеження швидкості"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "Властивості Засобів для обмеження швидкості"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr "лежачий поліцейський"
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr "шикана"
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr "звуження"
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr "лежачий поліцейський з розривами"
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr "широкий лежачий поліцейський"
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr "платформа"
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "Місце роз’їзду"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "Властивості Місця роз’їзду"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "Міні-круг"
@@ -24460,14 +24615,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "Напрямок"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "за годинниковою стрілкою"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "Пішохідний перехід"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "Властивості Пішохідного переходу"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "Назва типи (В.Брит)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "Засоби для обмеження швидкості"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "Властивості Засобів для обмеження швидкості"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr "лежачий поліцейський"
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr "шикана"
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr "звуження"
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr "лежачий поліцейський з розривами"
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr "широкий лежачий поліцейський"
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr "платформа"
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "Місце роз’їзду"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "Властивості Місця роз’їзду"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "Круг для розвороту"
@@ -24477,5 +24694,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "Знак «Межа міста»"
@@ -24483,15 +24700,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "Властивості знаку «Межа міста»"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "Друга назва"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "Камера (радар)"
@@ -24500,11 +24717,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "Телефон для екстрених викликів"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "Нахил"
@@ -24512,5 +24724,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "Крутий нахил"
@@ -24518,5 +24730,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr "Контейнер з піском (щебенем)"
@@ -24526,10 +24738,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "Брід"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "Властивості Броду"
@@ -24537,5 +24749,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -24543,5 +24755,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "Властивості Перевалу"
@@ -24550,10 +24762,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "Висота над рівнем моря"
@@ -24561,5 +24773,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "Перепони"
@@ -24567,5 +24779,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "Стовпчик"
@@ -24573,5 +24785,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "Властивості Стовпчика"
@@ -24616,16 +24828,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "Дозволено пересування:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "Перешкода для велосипедів"
@@ -24634,5 +24846,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "Блок"
@@ -24640,5 +24852,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "Перешкода для виходу худоби"
@@ -24646,10 +24858,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "Властивості Перешкоди для виходу худоби з пасовища на дорогу"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "Проїзд для автобусів"
@@ -24657,15 +24869,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "Шипи"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "Властивості Шипів"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "Пункт сплати за проїзд"
@@ -24673,5 +24885,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "Властивості Пункту сплати за проїзд"
@@ -24679,10 +24891,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "Прикордонний контроль"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "Властивості Прикордонного контролю"
@@ -24691,5 +24903,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "Жива огорожа"
@@ -24700,22 +24912,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "Паркан"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "паркан"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr "дерев’яний паркан"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr "паркан з дроту"
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "Стіна"
@@ -24723,5 +24935,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "Міська стіна"
@@ -24730,5 +24942,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "Підпірна стінка"
@@ -24739,10 +24951,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "Вхід/В’їзд"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "Властивості Входу/В’їзду"
@@ -24750,5 +24962,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "Ворота"
@@ -24756,50 +24968,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "Властивості Воріт"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr "Властивості Шлагбаума"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr "Дротяні ворота"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr "Властивості Дротяних воріт"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr "Ворота, що відкриваються бампером"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr "Властивості Воріт, що відкриваються бампером"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr "Вузька хвіртка"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr "Властивості Вузької хвіртки"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "Перелаз"
@@ -24807,25 +25019,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "Властивості Перелазу"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "Турнікет"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "Властивості Турнікету"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "Подвійні ворота (шлюз)"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "Властивості Подвійних воріт (шлюзу)"
@@ -24833,25 +25045,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "Джерело"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "Властивості Джерела"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "Дренажний канал"
@@ -24859,10 +25060,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "Властивості Дренажного каналу"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "Канава"
@@ -24870,10 +25071,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "Властивості Канави"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "Струмок"
@@ -24881,10 +25082,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "Властивості Струмка"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "Канал"
@@ -24892,10 +25093,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "Властивості Каналу"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "Ріка"
@@ -24905,59 +25106,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "Властивості Ріки"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "Джерело"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "Властивості Джерела"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "Водоспад"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "Властивості Водоспаду"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "Водозлив"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "Властивості Водозливу"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "Дамба"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "Властивості Дамби"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "Водойма"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "Властивості Водойми"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "Водосховище"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "Властивості Водосховища"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "Критий резервуар"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "Властивості Критого резервуара"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "Властивості Води"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "Суходіл"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "Властивості Суходолу"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "Водойма"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "Властивості Водойми"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "Водосховище"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "Властивості Водосховища"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "Критий резервуар"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "Властивості Критого резервуара"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "Узбережжя"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "Властивості Узбережжя"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "Берег ріки"
@@ -24966,10 +25221,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "Властивості Берега ріки"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "Заболочені землі"
@@ -24980,14 +25236,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "Властивості Заболочених земель"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "болото"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "торф’яне болото"
@@ -25001,35 +25257,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr "болото з відкритою водою"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr "плавні"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr "болото з солоною відкритою водою"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr "припливно-відливні ділянки"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "мангрові зарості"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr "Грязі"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr "Властивості Грязі"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "Пляж"
@@ -25037,20 +25293,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "Властивості Пляжу"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "Затока"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "Властивості Затоки"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "Скеля"
@@ -25058,145 +25314,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "Властивості Скелі"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "Узбережжя"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "Властивості Узбережжя"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "Магазини"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "Поромний причал"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "Властивості Поромного причалу"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "Автомобіль"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "початковий рівень"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "велосипедний"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "Поромна переправа"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "Властивості Поромної переправи"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "Човнова станція"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "Властивості Човнової станції"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "Док"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "Властивості Доку"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "Дамба"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "Властивості Дамби"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "Гідротехнічні споруди"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "Пристань для яхт"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "Властивості Пристані для яхт"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "Пірс"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "Властивості Пірсу"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "Ворота шлюзу"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "Водозлив"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "Властивості Водозливу"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "Водоспад"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "Властивості Водоспаду"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "Місце розвороту"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "Пристань для яхт"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "Властивості Пристані для яхт"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "Пірс"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "Властивості Пірсу"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "Поромний причал"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "Властивості Поромного причалу"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "Сліп"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -25206,16 +25533,38 @@
 msgstr "Властивості Сліпу"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "Човнова станція"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "Властивості Човнової станції"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "Док"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "Властивості Доку"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "Залізниця"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "Рейки"
@@ -25223,5 +25572,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "Властивості Рейок"
@@ -25251,7 +25600,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "Ширина колії (в мм)"
@@ -25267,8 +25616,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "Типи"
@@ -25282,29 +25631,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr "депо"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr "запасна колія"
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "вітка"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "Електрифікація"
@@ -25317,8 +25666,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "контактний дріт"
@@ -25389,8 +25738,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -25402,8 +25751,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "Напруга"
@@ -25416,8 +25765,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "Частота (Гц)"
@@ -25430,23 +25779,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "Вузькоколійка"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "Властивості Вузькоколійки"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "Монорейка"
@@ -25454,50 +25803,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "Властивості Монорейки"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "Законсервована"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "Властивості Законсервованої колії"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "Наземне метро"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "Властивості Наземного метро"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "Метрополітен"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "Властивості Метрополітену"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "Трамвайна лінія"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "Властивості Трамвайної лінії"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "Рейковий автобус"
@@ -25505,5 +25854,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "Властивості Рейкового автобуса"
@@ -25512,10 +25861,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "Путі, що не використовуються"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "Властивості Путів, що не використовуються"
@@ -25524,9 +25873,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "Додаткові типи"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "Занедбані колії"
@@ -25535,5 +25884,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "Залізничний переїзд"
@@ -25542,5 +25891,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "Перехід"
@@ -25550,5 +25899,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "Тип переходу"
@@ -25556,5 +25905,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "Поворотна платформа"
@@ -25563,5 +25912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "Буферний упор"
@@ -25570,10 +25919,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "Канатна дорога"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "Крісельний підйомник"
@@ -25581,10 +25930,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "Властивості Крісельного підйомника"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "Бугельний підйомник"
@@ -25592,10 +25941,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "Властивості Бугельного підйомника"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "Фунікулер"
@@ -25603,10 +25952,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "Властивості Фунікулера"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "З підвісними кабінами"
@@ -25614,10 +25963,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "Властивості Канатної дороги з підвісними кабінами"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -25626,5 +25976,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -25632,5 +25982,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25639,5 +25989,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -25645,5 +25995,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "Заправка"
@@ -25653,69 +26003,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "Властивості Заправки"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "земля"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
 msgstr "Indipend."
 
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -25732,34 +26105,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -25767,37 +26141,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "Години роботи"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -25818,33 +26203,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -25853,170 +26240,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "Цілодобово"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Вт-Нд 08:00-15:00;Сб 08:00-12:00"
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
 msgstr "З кіоском"
 
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "Міні-маркет"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "Кіоск"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "Види палива:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "Дизельне"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "Біодизель"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Дизельне (зріджений газ — супер-дизель)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Дизельне для вантажівок"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "бензин (91)"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "бензин (95)"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "бензин (98)"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "бензин (100)"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% суміш етанолу)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% суміш етанолу)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "метан"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr "паливна суміш 1/25 (для мопедів)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr "паливна суміш 1/50 (для мопедів)"
@@ -26024,4 +26433,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -26033,6 +26443,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Стоянка"
@@ -26041,5 +26451,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "Властивості Стоянки"
@@ -26050,25 +26460,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr "Номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "багаторівнева"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "наземна"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "підземна"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "Перехоплююча стоянка"
@@ -26077,54 +26489,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "Платна"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "Місткість (загальна)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "Місця для інвалідів"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "Місця для жінок"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "Місця для батьків"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Дивись в Wiki інші категорії місткості capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "Мийка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "Властивості Мийки"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "Автомобільний дилер"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "Властивості Автомобільного дилера"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "Автомайстерня"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "Властивості Автомайстерні"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "Типи"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "Властивості Дерева"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "Вміст"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "Номер телефону"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "Номер факсу"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "Веб-сайт"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "Адреса ел. пошти"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "Прокат"
@@ -26133,10 +26689,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "Властивості Прокату автомобілів"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "Спільне користування"
@@ -26144,28 +26699,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "Властивості Спільного користування"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "Властивості Велостоянки"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "Місткість"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "Мотоцикл"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "Властивості Автомагістралі"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "Придорожні послуги"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "Масштабування"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "погана"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "Заготовки"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "Одяг/Дрантя"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "Властивості Велостоянки"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "Місткість"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "Веломагазин"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "Властивості Веломагазина"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "Властивості Велопрокату"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -26175,5 +26789,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -26181,5 +26795,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "код UIC"
@@ -26187,5 +26801,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "Залізнична зупинка"
@@ -26193,5 +26807,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "Властивості Залізничної зупинки"
@@ -26199,5 +26813,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "Трамвайна зупинка"
@@ -26206,5 +26820,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "Властивості Трамвайної зупинки"
@@ -26212,5 +26826,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "Залізнична платформа"
@@ -26219,5 +26833,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "Властивості Залізничної платформи"
@@ -26229,5 +26843,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr "Номер платформи (путі)"
@@ -26235,10 +26849,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "Ділянка"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "Вхід в метро"
@@ -26247,10 +26861,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "Властивості Входу в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "В інвалідних візках"
@@ -26259,5 +26873,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "Автобусна станція"
@@ -26266,5 +26880,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "Свойства автобусной станции"
@@ -26272,5 +26886,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "Автобусна зупинка"
@@ -26280,13 +26894,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "Властивості Автобусної зупинки"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "Навіс"
@@ -26294,19 +26907,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "Лавка"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "Тактильне мощення"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "Властивості Автобусної платформи"
@@ -26314,5 +26927,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "Таксі"
@@ -26320,5 +26933,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "Властивості Стоянки таксі"
@@ -26326,10 +26939,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "Аеропорт"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "Територія аеропорту"
@@ -26337,5 +26950,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "Властивості Території аеропорту"
@@ -26343,10 +26956,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -26355,5 +26968,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "Злітно-посадкова смуга"
@@ -26361,5 +26974,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "Властивості Злітно-посадкової смуги"
@@ -26367,5 +26980,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "Руліжна доріжка"
@@ -26373,5 +26986,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "Властивості Руліжної доріжки"
@@ -26379,5 +26992,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "Вертолітний майданчик"
@@ -26385,5 +26998,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "Властивості Вертолітного майданчику"
@@ -26393,5 +27006,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "Перон"
@@ -26401,5 +27014,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "Ангар"
@@ -26410,6 +27023,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "Сигнальний вогонь"
@@ -26419,5 +27032,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "Вітровказівник (флюгер)"
@@ -26426,5 +27039,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "Термінал"
@@ -26432,5 +27045,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "Властивості Терміналу"
@@ -26438,15 +27051,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "Властивості Виходу на посадку"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "Подорожі"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "Житло"
@@ -26458,5 +27071,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Готель"
@@ -26465,5 +27078,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "Властивості Готелю"
@@ -26476,8 +27089,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "Зірки"
@@ -26501,34 +27114,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr "Інтернет доступ"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr "бездротовий"
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr "по проводах"
@@ -26542,168 +27155,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "термінал"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr "Плата за інтернет доступ"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr "Місця для паління"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr "тільки для курців"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr "роздільно"
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr "ізольовано"
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "Номер телефону"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr "Номер факсу"
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr "Веб-сайт"
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr "Адреса ел. пошти"
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "Мотель"
@@ -26711,20 +27229,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "Властивості Мотелю"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "Гостьовий будинок"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "Властивості Гостьового будинку"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "Дача/Шале"
@@ -26732,10 +27250,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "Властивості Дачі/Шале"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "Хостел/Туристичний табір"
@@ -26743,30 +27261,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "Праивти хостел/туристичний табір"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "Гірський притулок"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "Властивості Гірського притулку"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr "Стоянка фургонів"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr "Властивості Стоянки фургонів"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "Кемпінг"
@@ -26774,10 +27293,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "Властивості Кемпінгу"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "Харчування"
@@ -26788,5 +27307,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -26794,5 +27313,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "Властивості Ресторану"
@@ -26800,5 +27319,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26806,79 +27327,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "італійська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "китайська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "піца"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "бутерброди"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "грецька"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "німецька"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "індійська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "місцева"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "кебаб/шашлик"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "турецька"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "азійська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "тайська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "мексиканська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "японська"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "французька"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "сандвічі"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "суші"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr "Міні-пивоварня"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "Швидке харчування"
@@ -26886,18 +27407,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "Властивості Пунктів швидкого харчування"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "риба і чіпси"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "курятина"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr "Відкритий майданчик (кафе)"
@@ -26905,10 +27426,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr "Властивості Відкритого майданчику (кафе)"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "Кафе"
@@ -26916,10 +27437,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "Властивості Кафе"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "Шинок"
@@ -26927,20 +27453,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "Властивості Шинка"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr "Пивний сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr "Властивості Пивного саду"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "Бар"
@@ -26948,10 +27474,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "Властивості Бару"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "Нічний клуб"
@@ -26959,25 +27485,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "Властивості Нічного клубу"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "Атракціони"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "Властивості Атракціонів"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "Музей"
@@ -26985,9 +27511,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "Властивості Музею"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -26996,9 +27522,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "Властивості Зоопарку"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "Парк розваг"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "Властивості Парку розваг"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "Витвори мистецтв"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "Властивості Витворів мистецтв"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "Оглядовий майданчик"
@@ -27006,50 +27553,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "Властивості Оглядового майданчику"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr "Оглядова вежа"
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "Парк розваг"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "Властивості Парку розваг"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "Витвори мистецтв"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "Властивості Витворів мистецтв"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "Властивості Навісу"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "Вогнище"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "Місце для пікніка"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "Властивості Місця для пікніка"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "Інформаційне бюро"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "Мапа"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr "Тип мапи"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr "топографічна"
@@ -27087,5 +27635,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -27093,28 +27641,28 @@
 msgstr "мапа вулиць"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "Територія"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "місцевість"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "місто"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr "область"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr "Детальний опис"
@@ -27124,5 +27672,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr "Маршрути на мапі:"
@@ -27130,5 +27678,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "піші"
@@ -27136,6 +27684,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -27143,5 +27691,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr "для гірського велосипеду"
@@ -27149,6 +27697,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "Лижі"
@@ -27156,5 +27704,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr "кінні"
@@ -27162,46 +27710,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "…інші можливі способи пересування"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "Інформаційна дошка"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr "Вміст покажчика"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "повідомлення"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "історична довідка"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "жива природа"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "рослини"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "Вказівний стовп"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr "Флагшток"
@@ -27210,5 +27758,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr "Інформаційний термінал"
@@ -27216,55 +27764,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr "Детальний опис"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "Аудіогід"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "Аудіогід за допомогою мобільного телефону?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "Номер телефону"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "Інші інформаційні пункти"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "Властивості Навісу"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "Вогнище"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "Місце для пікніка"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "Властивості Місця для пікніка"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "Історичні місця"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "За́мок"
@@ -27273,19 +27800,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "Властивості Замку"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "Руїни"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "Властивості Руїн"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "Археологічні пам’ятки"
@@ -27294,9 +27821,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "Властивості Археологічних пам’яток"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "Поле бою"
@@ -27304,10 +27831,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "Властивості Поля бою"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "Палеонтологічні пам’ятки"
@@ -27315,5 +27842,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "Властивості Палеонтологічних пам’яток"
@@ -27321,15 +27848,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "Властивості Монументу"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "Пам’ятник"
@@ -27337,55 +27864,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "Властивості Пам’ятнику"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr "Придорожній Хрест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr "Властивості Придорожнього Хреста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr "Придорожня Рака"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr "Властивості Придорожньої Раки"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "Прикордонний камінь"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "Властивості Прикордонного каменя"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "Дозвілля"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "Властивості Аквапарку"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "Ігровий майданчик"
@@ -27393,35 +27920,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "Властивості Ігрового майданчику"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "Рибалка"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "Властивості місця для рибалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "Спортивні споруди"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "Стадіон"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "Властивості Стадіону"
@@ -27435,6 +27962,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "види спорту:"
@@ -27850,6 +28377,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27884,240 +28411,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "багатоборство"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "стрільба з лука"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "американський футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "австралійський футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr "боче (петанк)"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "канадський футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "каное"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "скелелазіння"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr "тренувальні сітки для крикету"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "собачі перегони"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "кінний спорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr "гаельський футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "гімнастика"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "кінські перегони"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "мотоспорт"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr "ліга регбі"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr "союз регбі"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "стрільба"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "катання на ковзанах"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "катання на лижах"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "плавання"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "настільний теніс"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "теніс"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "Спортивний центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "Властивості Спортивного центру"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "Спортивний майданчик"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "Властивості Спортивного майданчику"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "Бігова доріжка"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "Властивості Бігової доріжки"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "Поле для гольфу"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "Властивості Поля для гольфу"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "Міні-гольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "Властивості Поля для міні-гольфу"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "Багатоборство"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "Правити Багатоборство"
@@ -28134,5 +28661,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -28159,23 +28685,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "тип"
@@ -28192,5 +28726,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -28217,211 +28750,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr "спортивний майданчик"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "спортивний центр"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "стадіон"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "бігова доріжка"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr "Боулінг (10-кегельний)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr "Властивості Боулінгу"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "Властивості Атлетики"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "Стрільба з лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "Властивості Стрільби з лука"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "Скелелазіння"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "Властивості Скелелазіння"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "Веслування"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "Властивості Каное"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "Властивості Велоспорту"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "Собачі перегони"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "Властивості Собачих перегонів"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "Кінний спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "Властивості Кінного спорту"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "Кінні перегони"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "Властивості Кінських перегонів"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "Гімнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "Властивості Гімнастики"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "Мотоспорт"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "Властивості Мотоспорту"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "Катання на ковзанах"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "Властивості Катання на ковзанах"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "Властивості Скейтбордингу"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "Плавання"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "Властивості Плавання"
@@ -28429,52 +28965,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "Властивості Катання на лижах"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "Тип лижні"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "гірські лижі"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "бігові лижі"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "сніговий парк"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "Складність"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "початковий рівень"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "легкий рівень"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "складний рівень"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "для професіоналів"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr "фрірайд"
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "Стрільба"
@@ -28482,204 +29018,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "Властивості Стрільби"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "Спорт (з м’ячем)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "Властивості Футболу"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "Австралійський футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "Властивості Австралійського футболу"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "Американський футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "Властивості Американського футболу"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "Канадський футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "Властивості Канадського футболу"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "Гаельський футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "Властивості Гаельського футболу"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "Ліга регбі"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr "Властивості Ліги регбі"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "Союз регбі"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "Властивості Союзу регбі"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "Властивості Гольфу"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "поле для гольфу"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "Боче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "Властивості боче"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "Властивості Боулз"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "Властивості Крикету"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "Тренувальні сітки для крикету"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "Властивості Тренувальних сіток для крикету"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "Властивості Крокету"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "Властивості Хокею"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "Властивості Пелоти"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "Властивості Ракетболу"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "Настільний теніс"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "Властивості Настільного тенісу"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "Теніс"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "Властивості Тенісу"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "Мотоспорт"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "Властивості Мотоспорту"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "Попередження"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "Властивості Стоянки"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "Механічні транспортні засоби"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "Властивості Мотоспорту"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "Властивості Катання на ковзанах"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "Властивості Прикордонного контролю"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "Автомобіль"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "Властивості Фунікулера"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "Штучного походження"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "Будівля"
@@ -28687,5 +29289,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "Громадські будівлі"
@@ -28693,10 +29295,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "Властивості Громадської будівлі"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "Міська державна адміністрація"
@@ -28704,10 +29306,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "Властивості Міської державної адміністрації"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "Амбасада"
@@ -28715,10 +29317,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "Властивості Амбасади"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "Суд"
@@ -28727,10 +29329,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "Властивості Суду"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "В’язниця"
@@ -28739,10 +29341,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "Властивості В’язниці"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "Поліція/міліція"
@@ -28752,10 +29354,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "Властивості Поліції/міліції"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "Пожежна станція"
@@ -28764,10 +29366,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "Властивості Пожежного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "Пошта"
@@ -28775,5 +29377,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "Властивості Пошти"
@@ -28781,15 +29383,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "Дитячий садок"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "Властивості Дитячого саду"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "Школа"
@@ -28797,10 +29399,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "Властивості Школи"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "Університет"
@@ -28808,10 +29410,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "Властивості Університету"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "Коледж"
@@ -28819,5 +29421,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "Властивості коледжу"
@@ -28825,5 +29427,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "Кіно"
@@ -28832,10 +29434,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "Властивості Кінотеатру"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "Бібліотека"
@@ -28844,9 +29446,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "Властивості Бібліотеки"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "Центр мистецтв"
@@ -28854,10 +29456,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "Властивості Центру мистецтв"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "Театр"
@@ -28866,10 +29468,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "Властивості Театру"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "Культове місце"
@@ -28879,5 +29481,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "Властивості Культового місця"
@@ -28886,6 +29488,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "Релігія"
@@ -28894,66 +29496,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "бахаі"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "християнство"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "індуїзм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "джайнізм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "іудаїзм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "іслам"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "сикхізм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr "спіритуалізм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr "уніатство"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "Віросповідання"
@@ -28962,189 +29564,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "англіканська"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "баптизм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "католицизм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "євангелізм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr "свідки ієгови"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "лютеранство"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "методизм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "мормонство"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "православ’я"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "п’ятидесятники"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "пресвітеріанство"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "протестантизм"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "квакери"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "шиїти"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "суніти"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "Адреси"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "Властивості Адреси"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "Номер будинку"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "Назва будинку"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "Вулиця"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "Назва міста"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "Поштовий індекс"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "Код країни"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "Властивості Вставки адрес"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "Схема нумерації"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "непарні"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "парні"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "за абеткою"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "Штучні об’єкти"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "Заводи"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "Властивості Заводів"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "Башта"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "Властивості Башти"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "Тип Башти"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "зв’язку"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "спостереження"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "Висота (в метрах)"
@@ -29152,25 +29684,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "Водонапірна вежа"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "Властивості Водонапірної вежі"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "Властивості Газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -29178,10 +29710,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "Властивості Маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "Вітряк"
@@ -29189,10 +29721,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "Властивості Вітряка"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "Трубопровід"
@@ -29201,41 +29733,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "Властивості Трубопроводу"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "тепло"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "нафта"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "каналізація"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "іншого призначення"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "Розташування"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "підводне"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "надземне"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "Очисні споруди"
@@ -29245,10 +29777,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "Властивості Очисних споруд"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "Кран"
@@ -29256,5 +29788,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "Властивості Крану"
@@ -29262,10 +29794,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "Властивості Сигнального вогню"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "Геодезичний пункт"
@@ -29273,10 +29805,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "Властивості Геодезичного пункту"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "Камера спостереження"
@@ -29284,23 +29816,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "Властивості Камери спостереження"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "внутрішня"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "зовнішня"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "загальнодоступне"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "Електростанція"
@@ -29310,35 +29842,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "Властивості Електростанції"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "вітряна"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "гідро"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "теплова"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "вугільна"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "сонячна"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "Електропідстанція"
@@ -29347,10 +29879,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "Властивості Електропідстанції"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "Трансформаторна будка"
@@ -29359,5 +29891,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "Властивості Трансформаторної будки"
@@ -29365,10 +29897,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "назва (номер) мережі"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "Опора ЛЕП"
@@ -29379,23 +29911,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "Властивості Опори ЛЕП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "опора"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "стовп"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "Номер опори"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "Лінія електропередач"
@@ -29404,20 +29936,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "Властивості Лінії електропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "Тип лінії"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr "електромережа"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29425,55 +29957,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "Кількість кабелів"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "один провід"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "два проводи"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "три проводи"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "чотири проводи"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "Зручності"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr "обмежений"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "Примітка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "Поштова скринька"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "Телефон"
@@ -29482,5 +30014,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "Властивості телефону"
@@ -29488,5 +30020,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "Монети"
@@ -29494,5 +30026,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "Банкноти"
@@ -29500,5 +30032,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "Електронні гаманці та платіжні картки"
@@ -29506,5 +30038,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "Дебетові картки"
@@ -29512,15 +30044,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "Кредитні картки"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "Телефонні картки"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "Пункт прийому вторинної сировини"
@@ -29529,5 +30061,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "Властивості Пункту прийому вторинної сировини"
@@ -29535,35 +30067,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "Батарейки/Акумулятори"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "Бляшанки"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "Одяг/Дрантя"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "Скло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "Папір"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "Металобрухт"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "Урна для сміття"
@@ -29571,5 +30098,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "Властивості Урни для сміття"
@@ -29578,31 +30105,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "Матеріал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "камінь"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "Колір"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "чорний"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "коричневий"
@@ -29681,5 +30208,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -29689,31 +30216,31 @@
 msgstr "зелений"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "червоний"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "синій"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "сірий"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "білий"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "Кількість місць"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "Мисливська вежа"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "Властивості Мисливської вежі"
@@ -29721,31 +30248,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "Висота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "низька"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "половинна"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "повна"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "Прихована"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "Зачиняється"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29754,10 +30281,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "Властивості Фонтану"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "Питна вода"
@@ -29766,10 +30293,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "Властивості Питної води"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "Пожежний гідрант"
@@ -29778,5 +30305,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "Властивості Пожежного гідранту"
@@ -29784,501 +30311,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "Пішки"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "Супермаркет"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "Властивості Супермаркету"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "Міні-маркет"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "Властивості Міні-маркету"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "Кіоск"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "Властивості Кіоску"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "М’ясна лавка"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "Властивості М’ясної лавки"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "Булочна"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "Властивості Булочної"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "Екологічно чисті продукти"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "Властивості Магазину екологічно чистих проуктів"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "Алкогольні напої"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "Властивості Магазину алкогольних напоїв"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "Напої"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "Властивості Магазину напоїв"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "Магазини"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "Побутова хімія"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "Властивості Магазину побутової хімії"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "Перукарня"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "Властивості Перукарні"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "Оптика"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "Властивості Магазину оптики"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "Властивості Комп’ютерної крамниці"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "Взуття"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "Властивості Магазину взуття"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "Товари для активного відпочинку"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "Властивості Магазину товарів для активного відпочинку"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "Властивості Магазину спорт-товарів"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "Хімчистка"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "Властивості Хімчистки"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "Пральня"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "Властивості Пральні"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "колія зверху"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "Властивості Рейок"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "Комп’ютери"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "Властивості Комп’ютерної крамниці"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "Електроніка"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "Властивості Магазину побутової електроніки"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Аудіо апаратура"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "Властивості Магазину Аудіо апаратури"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "Відео"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "Властивості Магазину відео"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "Квітковий магазин"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "Властивості Квіткового магазину"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "Садово-парковий центр"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "Властивості Магазину садово-паркових товарів"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "Господарські товари"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "Властивості Магазину господарських товарів"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "Зроби сам"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "Властивості Магазину «Зроби сам»"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "Меблі"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "Властивості Меблевого магазину"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "Канцтовари"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "Властивості Магазину канцтоварів"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "Книжковий магазин"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "Властивості Книжкового магазину"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "Турагентство"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "Властивості Турагентства"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "Іграшки"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "Властивості Магазину іграшок"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "Торговий автомат"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "Властивості Торгового автомата"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "Товар"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "квитки на громадський транспорт"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr "схеми громадського транспорту"
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "талони на паркування"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "продукти харчування"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "напої"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "солодощі"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "сигарети"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "фотографії"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "їжа для тварин"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "газети"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "іграшки"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "марки"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-карти"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "телефонні картки"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr "ваучери"
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr "вело шини"
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "презервативи"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr "тампони"
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr "пакети для екскрементів"
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr "накопичувальні, дисконтні карти"
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "Гроші"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "Банк"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "Властивості Банку"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "Банкомат"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "Обмін валют"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "Властивості Пункту обміну валют"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "Властивості Банкомату"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "Медицина"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "Лікар"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "Властивості Лікаря"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "Стоматологія"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "Властивості Стоматології"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "Аптека"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "Властивості Аптеки"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "За рецептом"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "Лікарня"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "Властивості Лікарні"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "Вікно для покинутих немовлят"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "Властивості Вікна для покинутих немовлят"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "Магазини"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "Автомобільний дилер"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "Властивості Автомобільного дилера"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "Веломагазин"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "Властивості Веломагазина"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "Супермаркет"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "Властивості Супермаркету"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "Побутова хімія"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "Властивості Магазину побутової хімії"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "Міні-маркет"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "Властивості Міні-маркету"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "Кіоск"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "Властивості Кіоску"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "Книжковий магазин"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "Властивості Книжкового магазину"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "Турагентство"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "Властивості Турагентства"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "М’ясна лавка"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "Властивості М’ясної лавки"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "Булочна"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "Властивості Булочної"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "Квітковий магазин"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "Властивості Квіткового магазину"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "Екологічно чисті продукти"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "Властивості Магазину екологічно чистих проуктів"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "Алкогольні напої"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "Властивості Магазину алкогольних напоїв"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "Напої"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "Властивості Магазину напоїв"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "Комп’ютери"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "Властивості Комп’ютерної крамниці"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "Електроніка"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "Властивості Магазину побутової електроніки"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Аудіо апаратура"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "Властивості Магазину Аудіо апаратури"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "Меблі"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "Властивості Меблевого магазину"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "Садово-парковий центр"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "Властивості Магазину садово-паркових товарів"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "Господарські товари"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "Властивості Магазину господарських товарів"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "Зроби сам"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "Властивості Магазину «Зроби сам»"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "Канцтовари"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "Властивості Магазину канцтоварів"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "Перукарня"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "Властивості Перукарні"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "Взуття"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "Властивості Магазину взуття"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "Іграшки"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "Властивості Магазину іграшок"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "Відео"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "Властивості Магазину відео"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "Хімчистка"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "Властивості Хімчистки"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "Пральня"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "Властивості Пральні"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "Товари для активного відпочинку"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "Властивості Магазину товарів для активного відпочинку"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "Властивості Магазину спорт-товарів"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "Оптика"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "Властивості Магазину оптики"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "Торговий автомат"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "Властивості Торгового автомата"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "Товар"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "квитки на громадський транспорт"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr "схеми громадського транспорту"
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "талони на паркування"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "продукти харчування"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "напої"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "солодощі"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "сигарети"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "фотографії"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "їжа для тварин"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "газети"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "іграшки"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "марки"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-карти"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "телефонні картки"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr "ваучери"
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr "вело шини"
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "презервативи"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr "тампони"
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr "пакети для екскрементів"
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr "накопичувальні, дисконтні карти"
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "Гроші"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "Банк"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "Властивості Банку"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "Банкомат"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "Обмін валют"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "Властивості Пункту обміну валют"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "Властивості Банкомату"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "Медицина"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "Лікар"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "Властивості Лікаря"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "Стоматологія"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "Властивості Стоматології"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "Аптека"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "Властивості Аптеки"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "За рецептом"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "Лікарня"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "Властивості Лікарні"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "Пункт швидкої допомоги"
@@ -30287,5 +30816,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "Властивості Пункту швидкої допомоги"
@@ -30294,15 +30823,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "Номер пункту"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "Назва пункту"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)"
@@ -30310,5 +30839,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -30317,368 +30846,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "Властивості Ветеренарного пункту"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "Географія"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "Кордони"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "Державний"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "Властивості Державного кордону"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "Адміністративний"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "Властивості Адміністративного кордону"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "Громад"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "Властивості Меж громад"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "Політичні"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "Властивості політичного кордону"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "Національний парк"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "Властивості Кордону національного парку"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "Місця"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "Континент"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "Властивості Континенту"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "Країна"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "Властивості Країни"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "Штат"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "Властивості Штату"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "Область"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "Властивості Області"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "Район"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "Властивості Району"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "Місто (понад 100 000)"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "Властивості Міста"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "Місто"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "Властивості Селища"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "Передмістя"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "Властивості Передмістя"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "Село"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "Властивості Села"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "Хутір"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "Властивості Хутора"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "Місцевість"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "Властивості Місцевості"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "Вершина"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "Властивості Вершини"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "Льодовик"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "Властивості Льодовика"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "Вулкан"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "Властивості Вулкану"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "Вхід до печери"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "Властивості Входу до печери"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "Острів"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "Властивості Острова"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "Острівець"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "Властивості Острівця"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "природа"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "Дерево"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "Властивості Дерева"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "Ботанічна назва"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "Ліс"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "Властивості Лісу"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "хвойний"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "листяний"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "мішаний"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "Лісовий масив"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "Властивості Лісового масиву"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "Заповідник"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "Властивості Заповідника"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "Вхід до печери"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "Властивості Входу до печери"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "Вершина"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "Властивості Вершини"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "Льодовик"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "Властивості Льодовика"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "Вулкан"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "Властивості Вулкану"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "Кордони"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "Державний"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "Властивості Державного кордону"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "Адміністративний"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "Властивості Адміністративного кордону"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "Громад"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "Властивості Меж громад"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "Політичні"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "Властивості політичного кордону"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "Національний парк"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "Властивості Кордону національного парку"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "Осип"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "Властивості Осипи"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "Кам’яниста земля"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "Властивості Кам’янистої землі"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "Чагарник"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "Властивості Чагарнику"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "Пустир"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "Властивості Пустиря"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "Землекористування"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "Дерево"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "Властивості Дерева"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "Ботанічна назва"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "Ліс"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "Властивості Лісу"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "хвойний"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "листяний"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "мішаний"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "Лісовий масив"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "Властивості Лісового масиву"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "Заповідник"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "Властивості Заповідника"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "Осип"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "Властивості Осипи"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "Чагарник"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "Властивості Чагарнику"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "Кам’яниста земля"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "Властивості Кам’янистої землі"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "Пустир"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "Властивості Пустиря"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "Двір ферми"
@@ -30687,45 +31222,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "Властивості Двору ферми"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "Сільськогосподарські угіддя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "Властивості Сільськогосподарських угідь"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "Левада"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "Властивості Левади"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "Властивості Виноградників"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "Горо́д"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr "Властивості Го́родів"
@@ -30733,25 +31268,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "Властивості Садів"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "Властивості Газону"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "Сільський майдан"
@@ -30759,10 +31294,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "Властивості Сільського майдану"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "Землі місцевої громади"
@@ -30770,20 +31305,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "Властивості Земель місцевої громади"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "Властивості Парку"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "Майданчик для ігор"
@@ -30791,5 +31326,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "Властивості Майданчику для ігор"
@@ -30797,15 +31332,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "Житлова зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "Властивості Житлової зони"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "Цвинтар"
@@ -30813,9 +31348,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "Властивості Цвинтаря"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "Кладовище"
@@ -30823,39 +31358,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "Властивості Кладовища"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "Роздрібна торгівля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "Властивості Зони роздрібної торгівлі"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "Діловий район"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "Властивості Ділового району"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "Промзона"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "Властивості Промзони"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "Територія залізниці"
@@ -30863,15 +31398,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "Властивості Території залізниці"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "Військова зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "Властивості Військової зони"
@@ -30879,52 +31414,186 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "Будівельний майданчик"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "Властивості Будівельного майданчику"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "Очищене місце під забудову"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "Властивості Очищеного місця під забудову"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "Ділянка під нову забудову"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "Властивості Ділянки під нову забудову"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "Звалище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "Властивості Звалища"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "Кар’єр"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "Властивості Кар’єра"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "Станція"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "Адреси"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "Властивості Адреси"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "Номер будинку"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "Назва будинку"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "Вулиця"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "Назва міста"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "Поштовий індекс"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "Код країни"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "Викл."
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "Сх"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "Замін."
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "Пд"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "Властивості Вставки адрес"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "Схема нумерації"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "непарні"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "парні"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "за абеткою"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "Вміст"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "Додати інформацію про автора"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "зображення "
 
 #. item "Relations/Multipolygon"
@@ -30932,5 +31601,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "Властивості Мультиполігону"
@@ -30942,5 +31611,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "зовнішній сегмент"
@@ -30948,5 +31617,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "внутрішній сегмент"
@@ -30954,5 +31623,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "Кордони"
@@ -30963,5 +31632,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "Властивості Кордонів"
@@ -30969,36 +31638,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "Тип Кордону"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "адміністративний"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "національний"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "громади"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "політичний"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "Адміністративний рівень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "Підпорядкована територія"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "Адміністративний центр"
@@ -31006,5 +31675,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "Обмеження на поворот"
@@ -31013,5 +31682,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "Властивості Обмеження на поворот"
@@ -31019,34 +31688,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "Обмеження"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "поворот ліворуч заборонений"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "поворот праворуч заборонений"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "проїзд заборонений"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "розворот заборонений"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "тільки праворуч"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "тільки ліворуч"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "тільки прямо"
@@ -31055,15 +31724,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "з"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "через точку або лінію"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "до"
@@ -31071,5 +31740,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "Маршрут"
@@ -31078,5 +31747,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "Властивості маршруту"
@@ -31084,132 +31753,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "Тип маршруту"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "велосипедний"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "автобусний"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "дорога"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "поромний"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "лижний"
@@ -31277,5 +31835,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31285,9 +31843,9 @@
 msgstr "піший"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "трамвайний"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr "об’їзд"
@@ -31301,10 +31859,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr "Опис символів"
@@ -31312,31 +31870,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "Мережа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "Стан маршруту"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "планований"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "альтернативний"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "тимчасовий"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "з’єднуючий"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "Колір (hex)"
@@ -31345,30 +31903,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr "відрізок маршруту"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr "наступний відрізок"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr "попередній відрізок"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr "кінцева точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr "наступна кінцева точка"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr "попередня кінцева точка"
@@ -35346,7 +35904,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Тло Landsat"
+msgstr "Landsat (дзеркало)"
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -35468,8 +36025,48 @@
 msgstr "Італія – Сицилія"
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 — Італія"
+
+#~ msgid "Keep backup files"
+#~ msgstr "Зберігати резервні копії"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "Ви не можете вирівняти, з’єднані відрізки.\n"
+#~ "Будь ласка, оберіть два відрізки, що не мають спільних точок."
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Впорядкування відрізків.</b> Натисніть <b><i><span style=\"color:"
+#~ "green\">Shift-A</span></i></b>. Також ви можете знайти команду в меню "
+#~ "<b>Інструменти</b>\n"
+#~ " або можете призначити назначить дію на <b>панель інструментів</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Гідротехнічні споруди"
 
 #~ msgid "Error: {0}"
Index: applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- applications/editors/josm/i18n/po/zh_CN.po	(revision 22859)
+++ applications/editors/josm/i18n/po/zh_CN.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-16 08:49+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-28 08:24+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-20 19:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -31,5 +31,5 @@
 #: build/specialmessages.java:50
 msgid "Help"
-msgstr "帮助"
+msgstr "帮助(H)"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:451
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -94,5 +94,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "警告"
@@ -120,9 +120,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap 编辑器"
@@ -130,5 +130,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -195,5 +195,5 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 主网站的信息或历史纪录页面"
+"警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 主网站的信息或历史记录页面"
 "可能会失败。API 基础 URL为: ''{0}''"
 
@@ -238,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -277,5 +277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -300,5 +300,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -407,4 +407,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -422,5 +423,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -887,5 +888,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "显示 OSM 路径，节点或关系的历史纪录信息。"
+msgstr "显示 OSM 路径，节点或关系的历史记录信息。"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
@@ -1037,5 +1038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1044,5 +1045,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1055,5 +1056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1203,5 +1204,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
 msgid "Open a file."
-msgstr "打开一个文件."
+msgstr "打开一个文件。"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:82
@@ -1442,13 +1443,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr "清除"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr "确认清除"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1459,5 +1460,5 @@
 "i> 在<br> 上传时要求服务器删除。"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1465,9 +1466,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr "添加至选取对象"
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1475,5 +1476,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr "清除撤消/重做缓存"
@@ -1507,8 +1508,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1517,9 +1518,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1535,6 +1536,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1544,5 +1545,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1567,6 +1568,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "错误"
@@ -1723,5 +1724,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "否，中止"
@@ -1993,5 +1994,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2456,5 +2457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2496,18 +2497,18 @@
 "真的要移动它们吗?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放开鼠标按钮以选择矩形内的对象。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放开鼠标按钮以停止移动。按Ctrl 则会与最近的节点合并。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "放开鼠标按钮以停止旋转。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2778,5 +2779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "查找"
@@ -2979,7 +2980,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3239,5 +3240,5 @@
 msgstr[0] "移动 {0} 个节点"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3390,31 +3391,31 @@
 msgstr "自动修正标签"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr "无法创建目录 {0}，自动保存将被禁用"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "无法创建目录 {0}，将使用其他文件名"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "创建文件时发生 IO 错误，将跳过自动保存：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "无法删除旧的备份文件 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "创建删除图层的备份时发生错误：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3433,15 +3434,15 @@
 msgstr "不合法的经度数值 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告：将偏好设定固定为 \"{0}\" 失败"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "设定文件第 {0} 行格式不良"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3450,5 +3451,5 @@
 msgstr "警告：初始化偏好设定失败。偏好设定目录 \"{0}\" 不是一个目录。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3458,5 +3459,5 @@
 "<html>初始化偏好设定失败。<br>偏好设定目录 \"{0}\" 不是一个目录。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3465,5 +3466,5 @@
 msgstr "警告：初始化偏好设定失败。无法建立缺少的偏好设定目录：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3472,5 +3473,5 @@
 msgstr "<html>初始化偏好设定失败。<br>无法建立缺少的偏好设定目录：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3478,5 +3479,5 @@
 msgstr "警告：缺少偏好设定文件 \"{0}\"。正在建立预设的偏好设定文件。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3485,5 +3486,5 @@
 msgstr "警告：以预设的偏好设定文件取代现有的偏好设定文件 \"{0}\"。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3492,5 +3493,5 @@
 msgstr "<html>初始化偏好设定失败。<br>无法将偏好设定重设为预设值：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3501,5 +3502,5 @@
 "偏好设定文件。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3508,10 +3509,10 @@
 msgstr "警告：初始化偏好设定失败。无法将偏好设定重设为预设值：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "错误：在书签文件 \"{1}\" 中有未预期的行 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3631,5 +3632,5 @@
 msgstr "无法将原型 {0} 加入数据组合，因为它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3703,9 +3704,9 @@
 msgstr "不能将更改组合 ID > 0 指派给新的原型。更改组合 ID 的数值为 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "ID = 0 的原型不能为不可视。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3713,5 +3714,5 @@
 msgstr "不能合并，因为参与的原型是新的但其他的却不是"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3898,16 +3899,35 @@
 msgstr "PUWG 2000 区 {0} (波兰)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (瑞士)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM 区"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "南"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "跳至那里"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -3930,9 +3950,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3975,5 +3995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "铁路"
@@ -3994,5 +4014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4242,69 +4262,69 @@
 msgstr "密码"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "选项"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "显示此说明信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "标准 unix 几何引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "下载此绑定方块"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "于此 url 下载位置(具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "开启文件(任何可以使用文件/开启来开启的文件类型)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "下载绑定方块做为原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "将url (lat=x&lon=y&zoom=z) 的位置下载为原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "选取指定的查找"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "以最大化模式启动"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "重设偏好设定为预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "设定语言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "选项提供为 Java 系统属性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "改变所有用户设定值的文件夹"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4316,9 +4336,9 @@
 "      Java 选项以 MB 来指定分配到内存的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "范例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4326,59 +4346,68 @@
 msgstr "参数--download、 --downloadgps 和--selection 会以这个顺序处理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用--selection 请确定已载入某些数据。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "正在更新插件..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "正在安装更新的插件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "载入较早的插件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "设定预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "建立主窗口中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "正在载入插件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "未保存的 OSM 数据"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "恢复"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "借记卡"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM 发现 {0} 个未保存的 OSM 数据图层。它看上去像是 JOSM 上一次崩溃时留下的。"
 "你想恢复数据吗?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "偏好设定 {0} 已经被删除，因为它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4390,15 +4419,15 @@
 "Java (JRE) 或</li><li>使用更早版本 (兼容 Java 5) 的 JOSM。</li></ul>更多信息:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr "退出 JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
-msgstr ""
+msgstr "强制继续"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
-msgstr "文件"
+msgstr "文件(F)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
@@ -4406,9 +4435,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4416,5 +4446,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Edit"
-msgstr "编辑"
+msgstr "编辑(E)"
 
 #. Strings in JFileChooser
@@ -4422,5 +4452,5 @@
 #: build/specialmessages.java:76
 msgid "View"
-msgstr "查看"
+msgstr "查看(V)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
@@ -4428,5 +4458,5 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
 msgid "Tools"
-msgstr "工具"
+msgstr "工具(T)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -4434,5 +4464,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
-msgstr "预设组合 (&P)"
+msgstr "预设组合(P)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
@@ -4447,5 +4477,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
-msgstr "音效"
+msgstr "音效(A)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
@@ -4530,23 +4560,23 @@
 msgstr "用户："
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "图层不在清单中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "图层 \"{0}\" 必须在图层的清单中"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr "公制"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr "中文"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr "英制"
@@ -4642,5 +4672,5 @@
 msgstr "点击以关闭此对话框并放弃删除此对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4649,17 +4679,17 @@
 "<html>请以指定的缩放等级选择一个<strong> OSM 拼贴的范围</strong>。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "缩放等级："
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "从拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "到拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4669,25 +4699,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "拼贴位址："
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "应用这个拼贴位址"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "请输入拼贴位址"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "目前的数值不是有效的拼贴位址"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "请输入拼贴索引"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "目前的数值在指定的缩放等级中是无法使用的拼贴索引"
@@ -5077,4 +5107,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5157,4 +5188,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5171,4 +5203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5242,5 +5275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5252,10 +5285,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
-msgstr "没有"
+msgstr "无"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "全部"
@@ -5336,5 +5369,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5345,5 +5378,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5377,17 +5410,17 @@
 msgstr "尚未决定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "角色："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "输入所有关系成员的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "标签修改的关系为 "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5395,15 +5428,15 @@
 msgstr "<html>选择以启用输入一个标签可应用到<br>所有修改的关系。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "键值："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr "<html>输入标签键值，例如 <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5411,5 +5444,5 @@
 msgstr "数值："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5417,5 +5450,5 @@
 "<html>输入标签数值，例如 <strong><tt>check members</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5431,5 +5464,5 @@
 "代关系中原本的路径。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5445,5 +5478,5 @@
 "代关系中原本的路径。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "将这个角色应用到所有成员中"
@@ -5588,5 +5621,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5702,5 +5735,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5708,5 +5741,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5714,5 +5747,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5720,5 +5753,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5726,5 +5759,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5733,5 +5766,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5739,5 +5772,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5745,5 +5778,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5751,24 +5784,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>过滤条件已使用</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 对象已隐藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 对象已停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>关闭过滤条件对话框以查看所有的对象。<p></html>"
@@ -5778,16 +5811,16 @@
 #: ../plugins/reverter/src/reverter/ReverterPlugin.java:18
 msgid "History"
-msgstr "历史纪录"
+msgstr "历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 msgid "Display the history of all selected items."
-msgstr "显示所有选取的项目历史纪录。"
+msgstr "显示所有选取的项目历史记录。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:265
 msgid "Object with history"
-msgstr "有历史纪录的对象"
+msgstr "有历史记录的对象"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5806,5 +5839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:324
 msgid "Display the history of the selected objects."
-msgstr "显示选取对象的历史纪录。"
+msgstr "显示选取对象的历史记录。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:43
@@ -5812,37 +5845,37 @@
 msgstr "进阶的对象信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "输入新节点的座标"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "使用十进位度数"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "负数表示西半球/南半球"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "请输入有效的纬度范围 -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "请输入纬度范围 -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "请输入有效的经度范围 -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "请输入经度范围 -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "关闭此对话框并建立新的节点"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "关闭此对话框，不要建立新的节点"
@@ -5898,9 +5931,9 @@
 msgstr "关于图层的信息"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "关系"
@@ -5948,10 +5981,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "下载已选取关系的不完整成员"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "下载不完整的成员"
@@ -5971,37 +6004,37 @@
 msgstr "开启选择区域清单视窗。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "查找对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "缩放至选择区域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "缩放至选取的元件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "开启关系编辑器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "开启选取关系的关系编辑器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "在关系清单中选择"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "在关系清单中选择。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6010,32 +6043,32 @@
 msgstr "选择区域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "选择: 关系:{0} / 路径:{1} / 节点:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "选择区域：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "取得对象内部状态的详细信息。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "检查"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "解锁面板"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "关闭这个面板。您可以用左侧工具列的按钮重新开启它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "点击以最小化/最大化面板内容"
@@ -6267,9 +6300,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
 msgid "Show history"
-msgstr "显示历史纪录"
+msgstr "显示历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr "下载并显示选取原型的历史纪录"
+msgstr "下载并显示选取原型的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
@@ -6312,13 +6345,13 @@
 msgstr "没有可缩放的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "这个更改组合的内容尚未下载。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "立即下载"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "立即下载更改组合内容"
@@ -6430,4 +6463,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6446,6 +6483,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6463,8 +6498,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6475,4 +6517,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6487,33 +6535,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6537,12 +6574,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6614,10 +6661,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6647,8 +6698,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6711,6 +6758,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6763,4 +6808,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6825,32 +6882,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6859,6 +6924,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6867,24 +6934,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6899,82 +6956,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7055,155 +7112,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "名称"
@@ -7645,4 +7707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<不同>"
@@ -8153,17 +8216,17 @@
 msgstr "警告：因为工作已取消，忽略例外。例外为：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "包含父关系的直接子项"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "载入上层关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "正在载入上层关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "编辑目前选取的关系"
@@ -8444,4 +8507,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8449,15 +8513,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "类型"
@@ -8476,16 +8540,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "不明"
@@ -8617,23 +8681,23 @@
 #, java-format
 msgid "History for node {0}"
-msgstr "节点 {0} 的历史纪录"
+msgstr "节点 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
 #, java-format
 msgid "History for way {0}"
-msgstr "路径 {0} 的历史纪录"
+msgstr "路径 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
 #, java-format
 msgid "History for relation {0}"
-msgstr "关系 {0} 的历史纪录"
+msgstr "关系 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
 msgid "Reload the history from the server"
-msgstr "重新载入服务器的历史纪录"
+msgstr "重新载入服务器的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "历史纪录尚未初始化。设定参照原型失败。"
+msgstr "历史记录尚未初始化。设定参照原型失败。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8642,5 +8706,5 @@
 msgid ""
 "Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr "设定参照失败。参照ID {0} 与历史纪录ID {1} 不符。"
+msgstr "设定参照失败。参照ID {0} 与历史记录ID {1} 不符。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
@@ -8648,9 +8712,9 @@
 msgid ""
 "Failed to set reference. Reference version {0} not available in history."
-msgstr "设定参照失败。参照版本{0} 在历史纪录中无法使用。"
+msgstr "设定参照失败。参照版本{0} 在历史记录中无法使用。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr "历史纪录尚未初始化。设定目前的原型失败。"
+msgstr "历史记录尚未初始化。设定目前的原型失败。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -8659,25 +8723,25 @@
 "Failed to set current primitive. Current version {0} not available in "
 "history."
-msgstr "无法设定目前的原型。目前的版本{0} 并不存在历史纪录中。"
+msgstr "无法设定目前的原型。目前的版本{0} 并不存在历史记录中。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
-msgstr "载入历史纪录"
+msgstr "载入历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
-msgstr "正在载入节点 {0} 的历史纪录"
+msgstr "正在载入节点 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
-msgstr "正在载入路径 {0} 的历史纪录"
+msgstr "正在载入路径 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr "正在载入关系 {0} 的历史纪录"
+msgstr "正在载入关系 {0} 的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -8697,5 +8761,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
 msgid "Open a history browser with the history of this node"
-msgstr "开启历史纪录浏览器观看这个节点的历史纪录"
+msgstr "开启历史记录浏览器观看这个节点的历史记录"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
@@ -9079,5 +9143,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "开启文件选择器来选择文件"
@@ -9304,22 +9368,22 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
-msgstr "图层"
+msgstr "层"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
@@ -9782,5 +9846,60 @@
 msgstr[0] "{0} 个对象要删除："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "名称：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} 轨迹"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "时间跨度"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "长度"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "长度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} 路线， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} 航点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9788,59 +9907,16 @@
 msgstr "gps 点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "名称：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "描述：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} 轨迹"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "描述"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "时间跨度"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "长度"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "长度： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} 路线， "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} 航点"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "转换为数据图层"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9850,10 +9926,10 @@
 "轨迹，请看这里："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9864,7 +9940,7 @@
 msgstr "转换自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9872,10 +9948,10 @@
 msgstr "从 OSM 沿这条轨迹下载"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "下载这里面的每个对象："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9883,10 +9959,10 @@
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "每个要求最大区域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9894,21 +9970,21 @@
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "下载接近："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "只有轨迹"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "只有航点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "轨迹与航点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9919,9 +9995,9 @@
 "<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否希望<br>继续?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在图层中没有可用的 GPX 轨迹可供音效关联。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9929,5 +10005,5 @@
 msgstr "部分航点的时间戳记早于轨迹起点或晚于终点会被忽略或是转到起点。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9935,30 +10011,30 @@
 msgstr "部分航点离轨迹太远而无法明显判断其时间者会被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "自定义线条的绘制"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "使用全域设定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "在这个图层的各点之间绘出线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "在这个图层的各点之间不要绘出线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "选择线条绘制选项"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9966,5 +10042,5 @@
 msgstr "自定义颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9973,5 +10049,5 @@
 msgstr "预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9980,18 +10056,18 @@
 msgstr "选择一种颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "已命名点的标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名轨迹点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "输入音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10003,23 +10079,23 @@
 "记，我们不能将它们与声音数据关联。</html>\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "不可能输入"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音效文件 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音效标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "输入图片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10454,15 +10530,15 @@
 msgstr "无法删除图片文件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "没有图片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "正在载入 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11444,4 +11520,48 @@
 msgid "Voice recorder calibration"
 msgstr "录音机校准"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "更新间隔 (以日计)："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "预设值是 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "保存时，在备份文件名称的结尾加上 ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "文件备份"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "设定是否建立备份文件"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11490,10 +11610,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
-msgstr "本地文件"
+msgstr "仅本地文件"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
-msgstr "没有"
+msgstr "从不"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
@@ -11525,5 +11645,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "汽车"
@@ -11542,16 +11662,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "单车"
@@ -11585,12 +11705,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "步行"
@@ -11793,5 +11913,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79
 msgid "Show splash screen at startup"
-msgstr "启动时显示欢迎画面"
+msgstr "启动时显示欢迎页面"
 
 #. Show ID in selection
@@ -11836,18 +11956,18 @@
 msgstr "预设值(自动决定)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "启用内建预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "启用内建图示预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "用户样式"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "地图绘制样式"
@@ -12165,27 +12285,19 @@
 msgstr "无法使用投影法 {0}。改用麦卡托投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "验证"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "代理服务器设定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "文件备份"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "设定您的身份识别与如何在 OSM 服务器验证"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "设定是否使用代理服务器"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "设定是否建立备份文件"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -12302,6 +12414,15 @@
 "{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "外部工具"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12539,12 +12660,4 @@
 "础验证\"。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "保留备份文件"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "保存时，在备份文件名称的结尾加上 ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12731,5 +12844,5 @@
 msgstr "加入新标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12739,49 +12852,49 @@
 "损坏的预设组合 \"{0}-{1}\" - 在 display_values 中项目的数量必须和数值里的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "更多关于这个功能的信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明的必需品：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "可用的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "计次"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "元素"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "额外属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的类型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "预置无父元素的角色元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr "预置无父元素的子元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12791,15 +12904,15 @@
 msgstr "无法读取标签预设组合来源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 时发生错误： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "类型 {0} 的元件已支持。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12808,17 +12921,17 @@
 msgstr[0] "改变 {0} 个对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "尚未选择!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "选择区域不合适!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "应用预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13429,5 +13542,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13530,5 +13643,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13537,5 +13650,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13597,5 +13710,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
-msgstr "正在分析 OSM 历史纪录数据 ..."
+msgstr "正在分析 OSM 历史记录数据 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
@@ -13604,5 +13717,5 @@
 msgstr "文件 \"{0}\" 不存在"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13614,10 +13727,10 @@
 "\"{3}\",maxlat=\"{4}\", origin=\"{5}\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "发现 XML 元素 <nd> 并未做为元素 <way> 的直接子项。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13625,5 +13738,5 @@
 msgstr "路径 {1} 的 <nd> 缺少必要的属性 \"{0}\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13631,5 +13744,5 @@
 msgstr "元素 <nd> 的属性 \"ref\" 有不合格的数值。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13637,10 +13750,10 @@
 msgstr "删除的路径 {0} 包含节点"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr "发现 XML 元素 <member> 并未做为元素 <relation> 的直接子项。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13648,5 +13761,5 @@
 msgstr "在关系 {0} 的成员缺少属性 \"ref\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13654,5 +13767,5 @@
 msgstr "在关系 {0} 的成员属性 \"ref\"有不合格的数值。得到 {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13660,5 +13773,5 @@
 msgstr "在关系 {1} 的成员 {0} 缺少属性 \"type\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13667,10 +13780,10 @@
 msgstr "在关系 {1} 的成员 {0} 属性 \"type\" 有不合格的数值。得到 {2}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "不完整的 <member>> 规格，ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13678,9 +13791,9 @@
 msgstr "删除的关系 {0} 包含成员"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "标签中缺少设定键或数值属性。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13688,11 +13801,11 @@
 msgstr "在输入串流中发现未定义的元素 \"{0}\"。正在跳过。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "不合法的对象，id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13704,8 +13817,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13721,5 +13834,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13727,5 +13840,5 @@
 msgstr "不明或不支持的 API 版本。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13734,6 +13847,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13745,6 +13858,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13753,5 +13866,5 @@
 msgstr "属性 \"changeset\" 有不合格的数值。得到 \"{0}\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13759,5 +13872,5 @@
 msgstr "缺少必要的属性 \"{0}\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13765,5 +13878,5 @@
 msgstr "属性 \"{0}\" 有不合格的 long 数值。得到 \"{1}\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
@@ -13772,5 +13885,5 @@
 msgstr "外部 ID \"{0}\" 的路径包含了缺少的外部 ID \"{1}\" 的节点。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13778,5 +13891,5 @@
 msgstr "删除的节点 {0} 是路径 {1} 的一部分"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13788,5 +13901,5 @@
 "了。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13796,5 +13909,5 @@
 msgstr "外部 id \"{0}\" 的关系包含了缺少的外部 id \"{1}\" 的原型。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13802,17 +13915,17 @@
 msgstr "删除的成员 {0} 正由关系 {1} 使用"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "准备 OSM 数据..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "正在分析 OSM 数据..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "正在准备数据组合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -13867,5 +13980,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
-msgstr "正在下载历史纪录..."
+msgstr "正在下载历史记录..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
@@ -14310,11 +14423,11 @@
 msgstr "下载插件清单..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "正在从 \"{0}\" 下载插件清单"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14323,16 +14436,16 @@
 msgstr "警告：无法建立插件目录 \"{0}\"。不能从插件网站 \"{1}\" 缓存插件清单。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "正在将插件清单写入本地缓存 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "正在分析网站 \"{0}\" 的插件清单"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14341,5 +14454,5 @@
 msgstr "无法解析网站 \"{0}\" 的插件清单文件。正在跳过网站。例外为：{1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14360,13 +14473,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "回复程序错误"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14377,9 +14490,9 @@
 "请考虑不吝回复错误。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "未预期的例外"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14388,5 +14501,5 @@
 "您遇到了 JOSM 的错误。在您回复错误之前请确定您已更新到在这里最新版的 JOSM："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14396,5 +14509,5 @@
 "误："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14405,5 +14518,5 @@
 "一些。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14411,9 +14524,9 @@
 msgstr "另外，如果这些都不行您也可以在这个 URL 自行填写信息："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(该文字已复制到您的剪贴板中。)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "您遇到了 JOSM 的程序错误"
@@ -14650,5 +14763,5 @@
 "<br><br>错误的信息为：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14704,5 +14817,5 @@
 msgstr "未使用的"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14715,5 +14828,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14723,5 +14836,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14732,5 +14845,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(提示：您可以在偏好设定中编辑快捷键。)"
@@ -14836,5 +14949,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "可见状态"
@@ -14920,10 +15033,62 @@
 msgstr "上传轨迹至 openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "开放时间"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "改变属性至 {0} 个对象"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "选择"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "路径 {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "工具: {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "过滤器中的错误"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "开启"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "地址编排规则"
@@ -15095,58 +15260,59 @@
 msgstr "对齐路径"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"您不能对齐相互连接的区段。\n"
-"请选取两个没有共用任何节点的区段。"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "AlignWayS 信息"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"对齐会造成节点掉出世界之外。\n"
+"您的动作被还原了。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "准备就绪!"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "AlignWays 密诀"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "对齐路径模式"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "对齐路径区段"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "参数 \"{0}\" 不能为空"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"要对齐的区段不能和参考用区段是同一个。\n"
+"请选择不同的区段来对齐。"
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
 msgstr "AlignWayS 信息"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"对齐会造成节点掉出世界之外。\n"
-"您的动作被还原了。"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "准备就绪!"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "AlignWays 密诀"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "对齐路径模式"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "对齐路径区段"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "参数 \"{0}\" 不能为空"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"要对齐的区段不能和参考用区段是同一个。\n"
-"请选择不同的区段来对齐。"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -15279,27 +15445,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>对齐区段。</b> 请按 <b><i><span style=\"color:green\">Shift-A</"
-"span></i></b>。另外您可以在<b>工具</b>菜单找到这个指令\n"
-"，也可以把这个动作放置到<b>工具列</b>上。\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15320,5 +15467,5 @@
 "\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "不要再次显示这个信息"
@@ -15431,5 +15578,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "建筑物"
@@ -15680,5 +15827,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -15982,5 +16129,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:70
 msgid "Extract best fitting boundary..."
-msgstr "解出最合适的边界..."
+msgstr "提取最合适的边界..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:134
@@ -15990,5 +16137,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:33
 msgid "Contacting cadastre WMS ..."
-msgstr "正在连系 cadastre WMS ..."
+msgstr "正在连接 cadastre WMS ..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:40
@@ -16008,5 +16155,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 msgid "Only on vectorized layers"
-msgstr "只在矢量式图层"
+msgstr "只在矢量图层"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
@@ -16104,8 +16251,4 @@
 msgstr "东"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "北"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16223,6 +16366,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "空白图层"
@@ -17590,5 +17733,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "大众运输"
@@ -17632,48 +17775,53 @@
 msgstr "轨迹"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "路标"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "从 API 载入数据"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "数据已从 {0} 输入"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "建立新的对象"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "改变选择区域"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "改变查看端口"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "手动确认所有的远程控制动作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "允许 JOSM 被其他应用程序控制的插件。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "远程控制"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "远程控制插件的设定值。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17684,34 +17832,34 @@
 "应用程序与此插件的沟通。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "准许的动作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "您是否要允许这个?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "确认远程控制动作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "远程控制被要求建立新的节点。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "远程控制被要求自下列 URL 输入数据："
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "远程控制被要求自 API 下载数据。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "要求的详细数据：{0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17749,13 +17897,13 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
 msgid "Objects history"
-msgstr "对象历史纪录"
+msgstr "对象历史记录"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
 msgid "History reverter"
-msgstr "历史纪录还原"
+msgstr "历史记录还原"
 
 #: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:52
 msgid "Preparing history data..."
-msgstr "正在准备历史纪录数据..."
+msgstr "正在准备历史记录数据..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:50
@@ -17936,58 +18084,58 @@
 msgstr "从一个区域删除不必要的节点。"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "快速地图"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "自动缩放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "载入拼贴"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "显示拼贴信息"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "载入所有拼贴"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "增加缩放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "减少缩放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "贴紧拼贴大小"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "清除拼贴缓存"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "图片 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "自动缩放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "自动载入拼贴"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "快速地图"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "快速地图插件的设定值。"
@@ -18270,11 +18418,10 @@
 msgstr "连栋建筑"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "编辑管道"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19395,5 +19542,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "多重多边形"
@@ -19515,59 +19662,59 @@
 msgstr "重叠的路径"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "关系检查程序："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "这个插件会检查在关系中的错误。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "关系类型不明"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "关系是空白的"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<空白>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "缺少角色 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "角色验证问题"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "{0} 角色的编号太低 ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "{0} 角色的编号太高 ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "角色 {0} 成员的类型错误"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "不明的角色 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "发现空白角色"
@@ -20050,144 +20197,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "显示目前在影片中的位置"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "导入视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "与 GPS 轨迹同步视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "删除视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "从图层中删除当前视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "播放/暂停"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "开始/暂停播放视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "后退"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr "跳至后 n 秒"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "向上"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "请输入拼贴索引"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "前进"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr "跳至前 n 秒"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "加速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "加速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "减速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "减速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "循环"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "栅栏台阶"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "显示目前在影片中的位置"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20207,7 +20350,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "多个"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20303,12 +20445,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "选取指定的查找"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "路标"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20325,9 +20465,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "发生例外"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "不在缓存中"
@@ -20386,21 +20526,21 @@
 msgstr "调整选取的 WMS 图层的位置"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "请选择要调整的 WMS 图层。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "选择 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "开始调整"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "目前没有 WMS 图层要调整。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "没有要调整的图层"
@@ -20411,5 +20551,5 @@
 msgstr "从 {0} 下载 WMS 拼贴"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20418,5 +20558,5 @@
 msgstr "警告：WMS 服务基础 URL \"{0}\"  没有以 '&' 或 '?' 结尾。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20424,10 +20564,10 @@
 msgstr "警告：取回 WMS 拼贴似乎失败了。请检查您的偏好设定值。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "警告：完整 URL 为 \"{0}\"。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20438,24 +20578,24 @@
 "这可能会导致错误的坐标。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告：WMS 图层已停用，因为基础 URL \"{0}\" 出现异常"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(不使用)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 图层 ({0})，于缩放 {1} 自动下载"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 图层 ({0})，于缩放 {1} 下载"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20469,75 +20609,100 @@
 "取回 WMS 拼贴?\""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "是，抓取图片"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "无效的 URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "下载可见的拼贴"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的区域太大。请拉近一点，或是改变解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "改变解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "重新载入错误的拼贴"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "将 WMS 图层保存为文件"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "保存 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "从文件载入 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "载入 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支持的 WMS 文件版本；发现 {0}，应为 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "文件格式错误"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "载入文件有错误"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "设定 WMS 书签"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "自动下载"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "找不到地图对象。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "开啓空白 WMS 图层以便自文件载入数据"
@@ -20606,8 +20771,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "远程控制被要求自下列 URL 输入数据："
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21109,16 +21273,21 @@
 "题时只要点击面板而不需移动鼠标(一般性 Java - 平板电脑问题)。"
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "显示 OpenLayers 背景图片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "输入OpenStreetBugs 的议题"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21126,5 +21295,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21132,5 +21301,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21140,5 +21309,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21147,10 +21316,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑胶外观与感觉。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21158,15 +21327,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "让其他的应用程序传送指令给 JOSM。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "还原更改组合的插件"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21176,5 +21345,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21185,10 +21354,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "提供路线规画的功能。"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21197,5 +21366,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21205,15 +21374,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允许在目前的 gps 位置加入标记/节点。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格线中编辑标签的对话框。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21225,15 +21394,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "让连栋房屋能超出单一区块。"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21242,5 +21411,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21249,5 +21418,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21257,10 +21426,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "允许从 OSM 数据库中取消对象的删除"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21271,5 +21440,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21281,5 +21450,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21290,20 +21459,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下载一整组互相联结的路径"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21312,5 +21481,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21352,4 +21521,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21382,10 +21552,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "公路"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "街道"
@@ -21396,5 +21566,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速公路(Motorway)"
@@ -21403,5 +21573,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "编辑高速公路"
@@ -21438,10 +21608,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "道路编号"
@@ -21455,8 +21625,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "车道数"
@@ -21475,13 +21645,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -21515,17 +21685,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "单行道"
@@ -21562,17 +21732,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21606,17 +21776,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "隧道"
@@ -21647,17 +21817,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "断开"
@@ -21688,17 +21858,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "堤防"
@@ -21706,5 +21876,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "高速公路连络线"
@@ -21713,5 +21883,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "编辑高速公路连络线"
@@ -21719,5 +21889,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "快速道路(Trunk)"
@@ -21726,5 +21896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "编辑快速道路"
@@ -21734,6 +21904,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "汽车专用"
@@ -21741,5 +21911,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "快速道路连络线"
@@ -21748,5 +21918,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "编辑快速道路连络线"
@@ -21759,5 +21929,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "一级道路(Primary)"
@@ -21766,5 +21936,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "编辑一级道路"
@@ -21772,10 +21942,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "一级道路连络线"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "编辑一级道路连络线"
@@ -21787,5 +21957,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "二级道路(Secondary)"
@@ -21795,5 +21965,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "编辑二级道路"
@@ -21801,5 +21971,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "三级道路(Tertiary)"
@@ -21809,5 +21979,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "编辑三级道路"
@@ -21819,5 +21989,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "未分类道路(Unclassified)"
@@ -21827,5 +21997,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "编辑未分类道路"
@@ -21835,6 +22005,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr "让车区"
@@ -21857,15 +22027,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "宽度 (米)"
@@ -21877,5 +22047,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住区道路(Residential)"
@@ -21884,5 +22054,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "编辑居住区道路"
@@ -21902,12 +22072,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "路面"
@@ -21929,166 +22099,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "有铺面的"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "没铺面的"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "柏油"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "水泥地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "金属"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "木头"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "石子路"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "碎石路"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "鹅卵石"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "压实的"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "草地_铺面"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "沙地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "地面"
@@ -22096,5 +22266,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "生活街道"
@@ -22103,5 +22273,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "编辑生活街道"
@@ -22109,5 +22279,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "徒步区"
@@ -22116,5 +22286,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "编辑徒步区街道"
@@ -22122,5 +22292,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "服务道路(Service)"
@@ -22129,5 +22299,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "编辑服务道路"
@@ -22137,18 +22307,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "服务道路类型"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "车道"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "停车场通道"
@@ -22156,5 +22326,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "停车场通道"
@@ -22164,10 +22334,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "编辑停车场通道"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "道路(不明的类型)"
@@ -22176,5 +22346,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "编辑不明类型的道路"
@@ -22182,14 +22352,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "施工"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "编辑施工中的公路"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "交叉点"
@@ -22205,5 +22375,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "环岛"
@@ -22212,5 +22382,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "道路限制"
@@ -22219,15 +22389,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "编辑道路限制"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "收费"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "没有出口(死路)"
@@ -22235,5 +22405,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr "通行"
@@ -22259,4 +22429,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22264,4 +22435,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22337,236 +22514,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "私人"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "较宽松"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "农业"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "林业"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr "交付"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "不许"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "农业"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "允许"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "指定"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "私人"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "仅目的地"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "宽容"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "农业"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "林业"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr "交付"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "不许"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "农业"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "指定"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "官方"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "货物"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型车 (hgv)"
@@ -22581,10 +22765,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "马"
@@ -22600,10 +22784,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "摩托车"
@@ -22618,19 +22803,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "汽车"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "公共汽车 (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "最低限速 (km/h)"
@@ -22638,20 +22823,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "总重限制 (吨)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "高度限制 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "宽度限制 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "长度限制 (米)"
@@ -22659,5 +22844,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "环岛"
@@ -22668,5 +22853,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "编辑交叉点"
@@ -22686,10 +22871,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "高速公路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "高速公路连络线"
@@ -22711,10 +22896,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "快速道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "快速道路连络线"
@@ -22736,10 +22921,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "一级道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "一级道路连络线"
@@ -22761,5 +22946,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22774,9 +22959,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "三级道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "未分类道路"
@@ -22790,9 +22975,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "居住区道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "生活街道"
@@ -22836,10 +23021,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "服务道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "有轨电车专用道"
@@ -22869,5 +23054,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22879,10 +23064,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "编辑桥梁"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "编辑隧道"
@@ -22890,10 +23075,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "路径"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "路辙"
@@ -22902,35 +23087,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "编辑路辙"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "路辙类型"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "第一级"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "第二级"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "第三级"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "第四级"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "第五级"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB 比例"
@@ -22938,5 +23123,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "小径"
@@ -22945,76 +23130,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "编辑小径"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC 比例"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "健行"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "登山"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "费力的登山"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "高山登山"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "极好"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "良好"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "中级"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "差"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "恐怖的"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "轮椅"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "滑雪"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "雪上摩托车"
@@ -23023,5 +23208,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "专用马道"
@@ -23029,5 +23214,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "编辑马道"
@@ -23035,5 +23220,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "专用自行车道"
@@ -23051,11 +23236,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "编辑自行车道"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "行人"
@@ -23063,5 +23248,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "分离的步行与自行车道"
@@ -23069,5 +23254,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "合并的步行与自行车道"
@@ -23075,5 +23260,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "专用人行步道"
@@ -23082,5 +23267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "编辑人行步道"
@@ -23088,5 +23273,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "楼梯"
@@ -23096,10 +23281,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "编辑楼梯"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "座椅数量"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "高速公路出口"
@@ -23107,15 +23298,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "编辑高速公路出口"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "编号"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "服务站"
@@ -23123,5 +23314,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "编辑服务站"
@@ -23129,10 +23320,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23161,36 +23353,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "经营者"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "恢复"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "编辑餐厅"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "紧急电话"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "信号灯"
@@ -23200,5 +23413,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "人行横道类型"
@@ -23207,27 +23420,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "没有信号灯"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "信号灯"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "安全岛"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "未画标记"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr "骑马穿越"
@@ -23235,6 +23448,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "以自行车穿越"
@@ -23243,11 +23456,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "人行横道类型名称 (英国)"
@@ -23255,30 +23468,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "斑马线"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "禁止通行"
@@ -23286,67 +23499,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "人行横道"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "编辑人行横道"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "类型名称 (英国)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "道路减速设施"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "编辑道路减速设施"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "让车处"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "编辑让车处"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "小型环岛"
@@ -23357,14 +23508,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "顺时针"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "人行横道"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "编辑人行横道"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "类型名称 (英国)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "道路减速设施"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "编辑道路减速设施"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "让车处"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "编辑让车处"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "回旋圈"
@@ -23374,5 +23587,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "城市边界"
@@ -23380,15 +23593,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "编辑城市边界标志"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "第二名称"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "测速照相"
@@ -23397,11 +23610,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "紧急电话"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "坡"
@@ -23409,5 +23617,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "险升/降坡"
@@ -23415,5 +23623,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23423,10 +23631,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "浅滩"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "编辑浅滩"
@@ -23434,5 +23642,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "隘口"
@@ -23440,5 +23648,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "编辑隘口"
@@ -23447,10 +23655,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "海拔"
@@ -23458,5 +23666,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "障碍物"
@@ -23464,5 +23672,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "车阻柱"
@@ -23470,5 +23678,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "编辑车阻柱"
@@ -23513,16 +23721,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "允许通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "自行车护栏"
@@ -23531,5 +23739,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "水泥护栏"
@@ -23537,5 +23745,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "家畜栅栏"
@@ -23543,10 +23751,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "编辑家畜栅栏"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "公交车专用道障碍"
@@ -23554,15 +23762,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "长钉"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "编辑长钉"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "收费站"
@@ -23570,5 +23778,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "编辑收费站"
@@ -23576,10 +23784,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "国境管控站"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "编辑国境管控站"
@@ -23588,5 +23796,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "篱笆"
@@ -23597,22 +23805,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "栏栅"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "栏栅"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "墙"
@@ -23620,5 +23828,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "城墙"
@@ -23627,5 +23835,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "挡土墙"
@@ -23636,10 +23844,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "编辑入口"
@@ -23647,5 +23855,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "闸门"
@@ -23653,50 +23861,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "编辑闸门"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "栅栏台阶"
@@ -23704,25 +23912,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "编辑栅栏台阶"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "旋转栅门"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "编辑旋转栅门"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "城门"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "编辑城门"
@@ -23730,25 +23938,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "水域"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "泉"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "编辑泉"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "渠"
@@ -23756,10 +23953,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "编辑渠"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr "沟"
@@ -23767,10 +23964,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr "编辑沟"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "溪流"
@@ -23778,10 +23975,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "编辑溪流"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "运河"
@@ -23789,10 +23986,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "编辑运河"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "河流"
@@ -23802,59 +23999,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "编辑河流"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "泉"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "编辑泉"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "瀑布"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "编辑瀑布"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "堰"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "编辑堰"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "水坝"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "编辑水坝"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr "水池"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr "编辑水池"
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "贮水处"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "编辑贮水处"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "有覆盖的贮水处"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "编辑有覆盖的贮水处"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "编辑水域"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "陆地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "编辑陆地"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr "水池"
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr "编辑水池"
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "贮水处"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "编辑贮水处"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "有覆盖的贮水处"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "编辑有覆盖的贮水处"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "海岸线"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "编辑海岸线"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "河岸"
@@ -23863,10 +24114,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "编辑河岸"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "湿地"
@@ -23877,16 +24129,16 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "编辑湿地"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
-msgstr "沼泽"
-
-#: build/trans_presets.java:1041
+msgstr "沼泽(swamp)"
+
+#: build/trans_presets.java:1081
 msgid "bog"
-msgstr "泥沼"
+msgstr "沼泽(bog)"
 
 #. color woodarea
@@ -23898,35 +24150,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
-msgstr ""
-
-#: build/trans_presets.java:1041
+msgstr "沼泽(marsh)"
+
+#: build/trans_presets.java:1081
 msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1041
+msgstr "芦苇荡"
+
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1041
+msgstr "盐碱滩"
+
+#: build/trans_presets.java:1081
 msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1041
+msgstr "滩涂"
+
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "红树林"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
-msgstr ""
+msgstr "泥浆地"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
-msgstr ""
+msgstr "编辑泥浆地"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "海滩"
@@ -23934,20 +24186,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "编辑海滩"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "海湾"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "编辑海湾"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "断崖"
@@ -23955,145 +24207,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "编辑断崖"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "海岸线"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "编辑海岸线"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "购物"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "渡轮端点"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "编辑渡轮端点"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "汽车"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "新手"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "单车"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "渡轮路线"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "编辑渡轮"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr ""
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "船坞"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "编辑船坞"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "水坝"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "编辑水坝"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "水路点"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "码头"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "编辑码头"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "渡头"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "编辑渡头"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "调节水门"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "堰"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "编辑堰"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "瀑布"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "编辑瀑布"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "回旋点"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "码头"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "编辑码头"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "渡头"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "编辑渡头"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "渡轮端点"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "编辑渡轮端点"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "船台"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24103,16 +24426,38 @@
 msgstr "编辑造船台"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "船厂"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "编辑船厂"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "船坞"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "编辑船坞"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "运输"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "铁路"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "轨道"
@@ -24120,5 +24465,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "编辑轨道"
@@ -24148,7 +24493,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "轨距 (mm)"
@@ -24164,8 +24509,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "类型"
@@ -24179,29 +24524,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr "支线"
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr "电气化"
@@ -24214,8 +24559,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "接触网"
@@ -24286,8 +24631,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24299,8 +24644,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "电压"
@@ -24313,8 +24658,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "频率 (Hz)"
@@ -24327,23 +24672,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "窄轨"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "编辑窄轨"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "单轨"
@@ -24351,50 +24696,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "编辑单轨"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "保留铁路"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "编辑保留的铁路"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "轻轨"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "编辑轻轨"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "地铁"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "编辑地铁"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "有轨电车"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "编辑有轨电车"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "导轨巴士"
@@ -24402,5 +24747,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "编辑导轨巴士"
@@ -24409,10 +24754,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "不使用的轨道"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "编辑不使用的铁路"
@@ -24421,9 +24766,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "选择性的类型"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "废弃的轨道"
@@ -24432,5 +24777,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "铁路平交道"
@@ -24439,5 +24784,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "平交道"
@@ -24447,5 +24792,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "平交道类型"
@@ -24453,5 +24798,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "调车转盘"
@@ -24460,5 +24805,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr ""
@@ -24467,10 +24812,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "空中线路"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "椅式升降机"
@@ -24478,10 +24823,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "编辑椅式升降机"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr "拖曳升降机"
@@ -24489,10 +24834,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr "编辑拖曳升降机"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "缆车"
@@ -24500,10 +24845,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "编辑缆车"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "吊舱"
@@ -24511,10 +24856,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "编辑吊舱"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24523,5 +24869,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24529,5 +24875,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24536,5 +24882,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24542,5 +24888,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "加油站"
@@ -24550,69 +24896,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "编辑加油站"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "陆地"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr "阿吉普 (Agip)"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr "英国石油 (BP)"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr "科威特石油 (Q8)"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr "壳牌 (Shell)"
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "道达尔 (Total)"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "递增"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24629,34 +24998,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24664,37 +25034,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "开放时间"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24715,33 +25096,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24750,170 +25133,192 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24 小时"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "周一-周五 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr ""
-
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+msgstr "周二-周日 08:00-15:00;周六 08:00-12:00"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "有售货亭"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "便利商店"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "kiosk"
+msgstr "售货亭"
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "燃油类型："
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "柴油"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "生物柴油"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
+msgstr "柴油 (天然气合成)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "重型货车用柴油"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr "91 号汽油"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr "95 号汽油"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr "98 号汽油"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr "100 号汽油"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (添加 10% 乙醇)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (添加 85% 乙醇)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "液化石油气"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "压缩天然气"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24921,4 +25326,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24930,6 +25336,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "停车场"
@@ -24938,5 +25344,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "编辑停车场"
@@ -24947,25 +25353,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
-msgstr ""
+msgstr "编号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "多层"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "平面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr "停车换乘"
@@ -24974,54 +25382,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "费用"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "容量 (整体)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "残障专用空间"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "女性专用空间"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "父母专用空间"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "请参见维基页上的其他容量标签 capacity:[types]=*"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "洗车场"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "编辑"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "汽车经销商"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "编辑汽车商店"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "修车场"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "编辑修车场"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "类型"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "编辑树"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "内容"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "电话号码"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr "传真号码"
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr "网址"
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "租车"
@@ -25030,10 +25582,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "编辑租车"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "共享"
@@ -25041,28 +25592,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "编辑汽车共享"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "编辑自行车停车场"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "容量"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "摩托车"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "编辑高速公路"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "服务站"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "比例"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "差"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "预设组合(P)"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "衣服"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "编辑自行车停车场"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "容量"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "自行车经销商"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "编辑自行车商店"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "编辑自行车租用点"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25072,5 +25682,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25078,5 +25688,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "国际铁路联盟编号"
@@ -25084,5 +25694,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr "铁路停靠站"
@@ -25090,5 +25700,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr "编辑停靠站"
@@ -25096,5 +25706,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "有轨电车停靠站"
@@ -25103,5 +25713,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "编辑有轨电车停靠站"
@@ -25109,5 +25719,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "铁路月台"
@@ -25116,5 +25726,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "编辑铁路月台"
@@ -25126,5 +25736,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -25132,10 +25742,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "区域"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "地铁入口"
@@ -25144,10 +25754,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "编辑地铁入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "轮椅"
@@ -25156,5 +25766,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "公交车车站"
@@ -25163,5 +25773,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "编辑公交车车站"
@@ -25169,5 +25779,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "公交车停靠站"
@@ -25177,33 +25787,32 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "编辑公交车停靠站"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
-msgstr ""
+msgstr "庇护所"
 
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "长椅"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr "盲道"
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "公交车月台"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "编辑公交车月台"
@@ -25211,5 +25820,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "出租车"
@@ -25217,5 +25826,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "编辑出租车招呼站"
@@ -25223,27 +25832,27 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "机场"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
-msgstr "机场地面"
+msgstr "机场"
 
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
-msgstr "编辑机场地面"
+msgstr "编辑机场"
 
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25252,5 +25861,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "跑道"
@@ -25258,5 +25867,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "编辑跑道"
@@ -25264,5 +25873,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "滑行道"
@@ -25270,5 +25879,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "编辑滑行道"
@@ -25276,5 +25885,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "直升机停机坪"
@@ -25282,5 +25891,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "编辑直升机停机坪"
@@ -25290,5 +25899,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "停机坪"
@@ -25298,5 +25907,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "飞机库"
@@ -25307,6 +25916,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr "灯标"
@@ -25316,5 +25925,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr "风向袋"
@@ -25323,5 +25932,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr "航站楼"
@@ -25329,5 +25938,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr "编辑航站楼"
@@ -25335,15 +25944,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr "编辑登机口"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "旅游"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "住宿"
@@ -25355,5 +25964,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅馆"
@@ -25362,5 +25971,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "编辑旅馆"
@@ -25373,8 +25982,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "星级"
@@ -25398,36 +26007,36 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "网络接入"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
-msgstr ""
-
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+msgstr "无线"
+
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
-msgstr ""
+msgstr "有线"
 
 #. color aeroway
@@ -25439,168 +26048,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr "航站楼"
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
-msgstr ""
+msgstr "免费网络接入"
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "吸烟"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "专用"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
-msgstr ""
-
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgstr "隔离"
+
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
-msgstr ""
-
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "电话号码"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
+msgstr "远离"
 
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "汽车旅馆"
@@ -25608,20 +26122,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "编辑汽车旅馆"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr "宾馆/招待所"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr "编辑宾馆/招待所"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "小木屋"
@@ -25629,10 +26143,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "编辑小木屋"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "招待所"
@@ -25640,30 +26154,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "编辑招待所"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "高山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "编辑高山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
-msgstr ""
+msgstr "拖车营地"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
-msgstr ""
+msgstr "编辑拖车营地"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "露营区"
@@ -25671,10 +26186,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "编辑露营区"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "食物+饮料"
@@ -25685,5 +26200,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐厅"
@@ -25691,5 +26206,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "编辑餐厅"
@@ -25697,5 +26212,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "烹调风格"
@@ -25703,79 +26220,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "中式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "披萨"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "汉堡"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "希腊式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "德式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
-msgstr ""
-
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+msgstr "土耳其烤肉"
+
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "亚式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "泰式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "墨西哥式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "日式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "法式"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "三明治"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "寿司"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
-msgstr ""
+msgstr "自酿酒"
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "快餐"
@@ -25783,29 +26300,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "编辑快餐餐厅"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr "鱼和薯条"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr "鸡肉"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
-msgstr ""
+msgstr "美食广场"
 
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
-msgstr ""
+msgstr "编辑美食广场"
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "咖啡"
@@ -25813,10 +26330,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "编辑咖啡厅"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "酒店"
@@ -25824,20 +26346,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "编辑酒店"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "酒吧"
@@ -25845,10 +26367,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "编辑酒吧"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "夜店"
@@ -25856,25 +26378,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "编辑夜店"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "旅游相关"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "景点"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "编辑景点"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "博物馆"
@@ -25882,9 +26404,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "编辑博物馆"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "动物园"
@@ -25893,9 +26415,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "编辑动物园"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "主题乐园"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "编辑主题乐园"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "艺术工作"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "编辑艺术工作"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "景点"
@@ -25903,50 +26446,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "编辑景点"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "主题乐园"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "编辑主题乐园"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "艺术工作"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "编辑艺术工作"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "编辑庇护所"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "壁炉"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "野餐区"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "编辑野餐区"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "信息服务处"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "地图"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25984,5 +26528,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25990,28 +26534,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr "站点"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -26021,5 +26565,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -26027,5 +26571,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "健走"
@@ -26033,6 +26577,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "自行车"
@@ -26040,5 +26584,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -26046,6 +26590,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "滑雪"
@@ -26053,5 +26597,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -26059,46 +26603,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "信息板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr "提示"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "历史"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26107,5 +26651,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -26113,55 +26657,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "电话号码"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "其他的信息点"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "编辑庇护所"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "壁炉"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "野餐区"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "编辑野餐区"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "历史地区"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "城堡"
@@ -26170,19 +26693,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "编辑城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "遗迹"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "编辑遗迹"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "考古学地区"
@@ -26191,9 +26714,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "编辑考古学地区"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "战场"
@@ -26201,10 +26724,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "编辑战场"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr "古生物现场"
@@ -26212,5 +26735,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr "编辑古生物现场"
@@ -26218,15 +26741,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "纪念建筑"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "编辑纪念建筑"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "纪念碑"
@@ -26234,55 +26757,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "编辑纪念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "边界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "编辑边界石"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "休闲"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "水上乐园"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "编辑水上乐园"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "运动场"
@@ -26290,35 +26813,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "编辑运动场"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "钓鱼"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "编辑钓鱼场"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "运动"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "运动设施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "竞技场"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "编辑竞技扬"
@@ -26332,6 +26855,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "选择运动："
@@ -26747,6 +27270,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26781,240 +27304,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "多种"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "田径"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "橄榄球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "篮球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "法式滚球"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "保龄球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "加拿大足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "独木舟"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "板球"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "板球网"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "自行车"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "赛狗"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "马术"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "盖尔式足球"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "高尔夫"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "赛马"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "摩托车"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
-msgstr ""
-
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+msgstr "回力球"
+
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "射击"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr "滑冰"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "网球"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "运动中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "编辑运动中心"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr "足球场"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr "编辑足球场"
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "编辑跑道"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "高尔夫路线"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "编辑高尔夫路线"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "迷你高尔夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "编辑迷你高尔夫"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "运动"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "多种"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "编辑多种"
@@ -27031,5 +27554,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27056,23 +27578,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "类型"
@@ -27089,5 +27619,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27114,211 +27643,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "运动中心"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "竞技扬"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr "轨迹"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
-msgstr ""
+msgstr "保龄球"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:2154
+msgstr "编辑保龄球"
+
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "田径"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "编辑田径"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "编辑射箭"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "编辑攀岩"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "独木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "编辑独木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "编辑自行车"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "赛狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "编辑赛狗"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "马术"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "编辑马术"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "赛马"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "编辑赛马"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "编辑体操"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "摩托车运动"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "编辑摩托车运动"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "编辑溜冰"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "编辑滑板"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "编辑游泳"
@@ -27326,52 +27858,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "编辑滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr "滑雪方式"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr "高山"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr "北欧"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr "公园"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "困难度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "进阶"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "专家"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:2241
+msgstr "自由滑"
+
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "射击"
@@ -27379,204 +27911,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "编辑射击"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "运动(球类)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "编辑足球"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "编辑澳洲足球"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "编辑美式足球"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "加拿大式足球"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "编辑加拿大式足球"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr "盖尔式足球"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr "编辑盖尔式足球"
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr "联盟式橄榄球"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr "编辑联盟式橄榄球"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr "联合式橄榄球"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr "编辑联合式橄榄球"
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "编辑棒球"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "篮球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "编辑篮球"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "高尔夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "编辑高尔夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "高尔夫路线"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr "草地滚球"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr "编辑草地滚球"
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "保龄球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "编辑保龄球"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr "板球"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr "编辑板球"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr "板球网"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr "编辑板球网"
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "编辑木球"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "编辑曲棍球"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "编辑回力球"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr "墙网球"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr "编辑墙网球"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "编辑桌球"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "网球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "编辑网球"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "摩托车运动"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "编辑摩托车运动"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "警告"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "编辑停车场"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "汽车"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "编辑摩托车运动"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "编辑溜冰"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "编辑国境管控站"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "汽车"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "编辑缆车"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "人造"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "建筑物"
@@ -27584,5 +28182,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "公共建筑"
@@ -27590,10 +28188,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "编辑公共建筑"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "县市政府/公所"
@@ -27601,10 +28199,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "编辑县市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "大使馆"
@@ -27612,10 +28210,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "编辑大使馆"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "法院"
@@ -27624,10 +28222,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "编辑法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "监狱"
@@ -27636,10 +28234,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "编辑监狱"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "警察局"
@@ -27649,10 +28247,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "编辑警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "消防队"
@@ -27661,10 +28259,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "编辑消防队"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "邮局"
@@ -27672,5 +28270,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "编辑邮局"
@@ -27678,15 +28276,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "幼儿园"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "编辑幼儿园"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "学校"
@@ -27694,10 +28292,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "编辑学校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "大学"
@@ -27705,10 +28303,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "编辑大学"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "学院"
@@ -27716,5 +28314,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "编辑学院"
@@ -27722,5 +28320,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "电影院"
@@ -27729,10 +28327,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "编辑电影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "图书馆"
@@ -27741,9 +28339,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "编辑图书馆"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "美术馆"
@@ -27751,10 +28349,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "编辑美术馆"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "剧院"
@@ -27763,10 +28361,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "编辑剧院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "宗教仪式场所"
@@ -27776,5 +28374,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "编辑宗教仪式场所"
@@ -27783,6 +28381,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "宗教"
@@ -27791,66 +28389,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "犹太教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "锡克教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "教派"
@@ -27859,189 +28457,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "英国国教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "浸信会"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "福音派教会"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "卫理公会教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "摩门教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "东正教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "圣灵降临教派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "长老派教会"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "什叶派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "逊尼派"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "地址"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "编辑地址信息"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "门牌号码"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "房屋名称"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "街道名称"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "城市名称"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "邮递区号"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "国码"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "编辑地址插值方法"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "编号规则"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "奇数"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "偶数"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "按字母顺序"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "编辑作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "编辑塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "塔类型"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "通讯"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "观测"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "高度(米)"
@@ -28049,25 +28577,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "贮水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "编辑贮水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "贮气桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "编辑贮气桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "灯塔"
@@ -28075,10 +28603,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "编辑灯塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "风车"
@@ -28086,10 +28614,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "编辑风车"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "管道"
@@ -28098,41 +28626,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "编辑管道"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "天然气"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr "热力"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr "污水"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr "任何物质"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "位置"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr "水下"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "污水处理厂"
@@ -28142,10 +28670,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "编辑污水处理厂"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "起重机"
@@ -28153,5 +28681,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "编辑起重机"
@@ -28159,10 +28687,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr "编辑灯标"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "测量点"
@@ -28170,10 +28698,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "编辑测量点"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "监视"
@@ -28181,23 +28709,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "编辑监视摄影机"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr "室内"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "户外"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr "公共"
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "发电厂"
@@ -28207,35 +28735,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "编辑发电厂"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "风力"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "光电"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "配电站"
@@ -28244,10 +28772,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "编辑配电站"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr "配电分站"
@@ -28256,5 +28784,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr "编辑配电分站"
@@ -28262,10 +28790,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr "电线编号"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "电塔"
@@ -28276,23 +28804,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "编辑电塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr "塔"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr "杆"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr "塔编号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "电线"
@@ -28301,20 +28829,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "编辑电线"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr "电线类型"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr "高压线"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28322,55 +28850,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "电缆数"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "单根"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "双根"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "三根"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr "四根"
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "便利设施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "厕所"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr "注释"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "邮筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "电话"
@@ -28379,5 +28907,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "编辑电话"
@@ -28385,5 +28913,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "硬币"
@@ -28391,5 +28919,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr "纸币"
@@ -28397,5 +28925,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "电子钱包或收费卡"
@@ -28403,5 +28931,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr "借记卡"
@@ -28409,15 +28937,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "电话卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "资源回收"
@@ -28426,5 +28954,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "资源回收站"
@@ -28432,35 +28960,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "电池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "瓶罐"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "衣服"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "纸张"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "废金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr "废纸篓"
@@ -28468,5 +28991,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr "编辑废纸篓"
@@ -28475,31 +28998,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "材质"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "石头"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "塑胶"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "颜色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "浅褐色"
@@ -28578,5 +29101,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28586,31 +29109,31 @@
 msgstr "绿色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "红色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "蓝色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "座椅数量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr "狩猎站"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr "编辑狩猎站"
@@ -28618,31 +29141,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "隐藏"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "锁"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "喷泉"
@@ -28651,10 +29174,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "编辑喷泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "饮水机"
@@ -28663,10 +29186,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "编辑饮水机"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -28675,5 +29198,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "编辑消防栓"
@@ -28681,501 +29204,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "步行"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "超级市场"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "编辑超级市场"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "便利商店"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "编辑便利商店"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr "售货亭"
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr "编辑售货亭"
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "肉类"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "编辑肉店"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "面包店"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "编辑面包店"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "有机产品"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "编辑有机产品商店"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "酒"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "编辑卖酒的商店"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "饮料"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "编辑饮料店"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "商店"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr "药店"
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr "编辑药店"
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "美发店"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "编辑美发店"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "眼镜"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "编辑眼镜行"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "编辑电脑商店"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "鞋"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "编辑鞋店"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "户外用品"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "编辑户外用品店"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "编辑运动用品店"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "干洗"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "编辑干洗店"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "洗衣店"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "编辑洗衣店"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "轨道"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "编辑轨道"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "电脑"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "编辑电脑商店"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "电子材料"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "编辑电子材料行"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "编辑 Hifi 音响店"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "影片"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "编辑影片类商店"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "花类"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "编辑花店"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "园艺中心"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "编辑园艺中心"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "硬件"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "编辑硬件商店"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "DIY 商店"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "编辑 DIY 商店"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "家俱"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "编辑家俱店"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "文具"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "编辑文具店"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "书店"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "编辑书店"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "旅行社"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "编辑旅行社"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "玩具"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "编辑玩具店"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "自动贩卖机"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "编辑自动贩卖机"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "贩卖产品"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr "公共交通车票"
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr "停车票"
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "食物"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "饮料"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "甜点"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "菸"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "相片"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "饲料"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "报纸"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "玩具"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "邮票"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-卡"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr "电话券"
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "保险套"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "现金"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "银行"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "编辑银行"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "自动提款机 (ATM)"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "金钱兑换所"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "编辑金钱兑换所"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "编辑自动提款机"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "健康"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "医师"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "编辑医师"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "牙医"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "编辑牙医"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "药局"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "编辑药局"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "配药"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "医院"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "编辑医院"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "弃婴保护舱"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "编辑弃婴保护舱"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "商店"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "汽车经销商"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "编辑汽车商店"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "自行车经销商"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "编辑自行车商店"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "超级市场"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "编辑超级市场"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr "药店"
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr "编辑药店"
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "便利商店"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "编辑便利商店"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr "售货亭"
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr "编辑售货亭"
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "书店"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "编辑书店"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "旅行社"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "编辑旅行社"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "肉类"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "编辑肉店"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "面包类"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "编辑面包店"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "花类"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "编辑花店"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "有机产品"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "编辑有机产品商店"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "酒"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "编辑卖酒的商店"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "饮料"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "编辑饮料店"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "电脑"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "编辑电脑商店"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "电子材料"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "编辑电子材料行"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "编辑 Hifi 音响店"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "家俱"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "编辑家俱店"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "园艺中心"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "编辑园艺中心"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "硬件"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "编辑硬件商店"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "DIY 商店"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "编辑 DIY 商店"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "文具"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "编辑文具店"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "美发店"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "编辑美发店"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "鞋"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "编辑鞋店"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "玩具"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "编辑玩具店"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "影片"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "编辑影片类商店"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "干洗"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "编辑干洗店"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "洗衣店"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "编辑洗衣店"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "户外用品"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "编辑户外用品店"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "编辑运动用品店"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "眼镜"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "编辑眼镜行"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "自动贩卖机"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "编辑自动贩卖机"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "贩卖产品"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr "公共交通车票"
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr "停车票"
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "食物"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "饮料"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "甜点"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "菸"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "相片"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "饲料"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "报纸"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "玩具"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "邮票"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-卡"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr "电话券"
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "保险套"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "现金"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "银行"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "编辑银行"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "自动提款机 (ATM)"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "金钱兑换所"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "编辑金钱兑换所"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "编辑自动提款机"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "健康"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "医师"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "编辑医师"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "牙医"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "编辑牙医"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "药局"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "编辑药局"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "配药"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "医院"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "编辑医院"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "紧急连络点"
@@ -29184,5 +29709,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "编辑紧急连络点"
@@ -29191,15 +29716,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用国际码，像是 +12-345-67890)"
@@ -29207,5 +29732,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "兽医"
@@ -29214,368 +29739,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "编辑兽医"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "地理"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "边界"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "国家"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "编辑国界"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "行政区"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "编辑行政区边界"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "城市"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "编辑城市边界"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "政治"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "编辑政治边界"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "国家公园"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "编辑国家公园"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "地名"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr "大洲"
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr "编辑大洲"
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "国家"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "编辑国家"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr "省/州"
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr "编辑省/州"
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr "地区"
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr "编辑地区"
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "县"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "编辑县"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "市"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "编辑市"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "镇"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "编辑镇"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "郊区"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "编辑郊区"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "村"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "编辑村"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr "自然村"
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr "编辑自然村"
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr "地区"
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr "编辑地区"
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "峰"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "编辑山峰"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "冰河"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "编辑冰河"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "火山"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "编辑火山"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "洞窟入口"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "编辑洞窟入口"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "岛"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "编辑岛"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr "屿"
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr "编辑屿"
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "自然"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "树"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "编辑树"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "植物学名"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr "树林"
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr "编辑树林"
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "松类"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "落叶类"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "混合"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "森林"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "编辑森林土地利用"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "自然保护区"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "编辑自然保护区"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "洞窟入口"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "编辑洞窟入口"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "峰"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "编辑山峰"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "冰河"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "编辑冰河"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "火山"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "编辑火山"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "边界"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "国家"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "编辑国界"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "行政区"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "编辑行政区边界"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "城市"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "编辑城市边界"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "政治"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "编辑政治边界"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "国家公园"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "编辑国家公园"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr "碎石坡"
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr "编辑碎石坡"
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr "丘陵"
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr "编辑丘陵"
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr "灌木丛"
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr "编辑灌木丛"
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr "荒地"
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr "编辑荒地"
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "树"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "编辑树"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "植物学名"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr "树林"
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr "编辑树林"
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "松类"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "落叶类"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "混合"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "森林"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "编辑森林土地利用"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "自然保育"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "编辑自然保育"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr "碎石坡"
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr "编辑碎石坡"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr "灌木丛"
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr "编辑灌木丛"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr "丘陵"
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr "编辑丘陵"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr "荒地"
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr "编辑荒地"
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr "农家庭院"
@@ -29584,45 +30115,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr "编辑农家庭院"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "农田"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "编辑农田"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "牧场"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "编辑牧场"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr "葡萄园"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr "编辑葡萄园"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr "开心农场(?)"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29630,25 +30161,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "花园"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "编辑花园"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr "编辑草地"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr "村镇公用绿地"
@@ -29656,10 +30187,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr "编辑村镇公用绿地"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr "公共用地"
@@ -29667,20 +30198,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr "编辑公共用地"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "公园"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "编辑公园"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr "游乐场"
@@ -29688,5 +30219,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr "编辑游乐场用地"
@@ -29694,15 +30225,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr "居住区"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr "编辑居住区"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr "墓地(常在教堂附近)"
@@ -29710,9 +30241,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr "编辑墓地"
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr "墓地(不靠近教堂)"
@@ -29720,39 +30251,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr "编辑墓地"
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr "零售"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr "编辑零售用地"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr "商业"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr "编辑商业用地"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "工业"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr "编辑工业用地"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr "铁路用地"
@@ -29760,15 +30291,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr "编辑铁路用地"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "军事"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr "编辑军事用地"
@@ -29776,52 +30307,186 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr "建筑区"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr "编辑建筑区"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr "棕色地带(待重新开发的城市用地)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr "编辑棕色地带"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr "绿地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr "编辑绿地"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr "垃圾填埋场"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr "编辑垃圾填埋场"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr "采石场"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr "编辑采石场"
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "车站"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "地址"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "编辑地址信息"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "门牌号码"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "房屋名称"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "街道名称"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "城市名称"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "邮递区号"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "国码"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "东"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "南"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "编辑地址插值方法"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "编号规则"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "奇数"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "偶数"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "按字母顺序"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "内容"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "加入作者信息"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+#, fuzzy
+msgid "Image"
+msgstr "图片 "
 
 #. item "Relations/Multipolygon"
@@ -29829,5 +30494,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr "编辑多重多边形"
@@ -29839,5 +30504,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr "外围"
@@ -29845,5 +30510,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr "内围"
@@ -29851,5 +30516,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr "边界"
@@ -29860,5 +30525,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr "编辑边界"
@@ -29866,36 +30531,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr "边界类型"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr "行政区界"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr "国界"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr "市界"
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr "政治分界"
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr "行政区界等级"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr "郊区"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr "行政中心"
@@ -29903,5 +30568,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "转弯限制"
@@ -29910,5 +30575,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "编辑转弯限制"
@@ -29916,34 +30581,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr "限制"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr "禁止左转"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr "禁止右转"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr "禁止直行"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr "禁止掉头"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr "只可右转"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr "只可左转"
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr "只可直行"
@@ -29952,15 +30617,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "出发 路径"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "经过 节点或路径"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "到达 路径"
@@ -29968,5 +30633,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "路线"
@@ -29975,5 +30640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "编辑路线"
@@ -29981,132 +30646,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "路线类型"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "单车"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "公交车"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "渡轮"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr "滑雪"
@@ -30174,5 +30728,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30182,9 +30736,9 @@
 msgstr "步行"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "有轨电车"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -30198,10 +30752,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "地铁"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -30209,31 +30763,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "网络"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr "路线状况"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr "建议"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr "备用"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr "临时"
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "连接"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "颜色(16 进制)"
@@ -30242,30 +30796,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34243,7 +34797,6 @@
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
-#, fuzzy
 msgid "Landsat (mirror)"
-msgstr "Landsat"
+msgstr ""
 
 #. http://irs.gis-lab.info/?layers=landsat&
@@ -34365,8 +34918,47 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "保留备份文件"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "您不能对齐相互连接的区段。\n"
+#~ "请选取两个没有共用任何节点的区段。"
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>对齐区段。</b> 请按 <b><i><span style=\"color:green\">Shift-A</"
+#~ "span></i></b>。另外您可以在<b>工具</b>菜单找到这个指令\n"
+#~ "，也可以把这个动作放置到<b>工具列</b>上。\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "水路点"
 
 #~ msgid "The selected way does not contain the selected node."
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 22859)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 22863)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-20 22:00+0200\n"
-"PO-Revision-Date: 2010-08-14 00:47+0000\n"
+"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"PO-Revision-Date: 2010-08-21 00: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-08-20 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-08-29 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -95,5 +95,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:131
 msgid "Warning"
 msgstr "警告"
@@ -121,9 +121,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:793
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:795
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:60
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap 編輯器"
@@ -131,5 +131,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 #, java-format
 msgid "Version {0}"
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -253,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -268,5 +268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
@@ -278,5 +278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -301,5 +301,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 #: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
@@ -408,4 +408,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
@@ -423,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1038,5 +1039,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1045,5 +1046,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1056,5 +1057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
 msgid "URL"
 msgstr "URL"
@@ -1443,13 +1444,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
 msgid ""
 "This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1458,5 +1459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
 msgid ""
 "The following dependent objects will be purged<br> in addition to the "
@@ -1464,9 +1465,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
 msgid ""
 "Some of the objects are modified.<br> Proceed, if these changes should be "
@@ -1474,5 +1475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
 msgstr ""
@@ -1506,8 +1507,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
@@ -1516,9 +1517,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -1534,6 +1535,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1543,5 +1544,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1566,6 +1567,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:461
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
 msgid "Error"
 msgstr "錯誤"
@@ -1722,5 +1723,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "No, abort"
 msgstr "否，中止"
@@ -1992,5 +1993,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2455,5 +2456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
@@ -2495,18 +2496,18 @@
 "真的要移動它們嗎？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:534
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2779,5 +2780,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "搜尋"
@@ -2980,7 +2981,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
@@ -3240,5 +3241,5 @@
 msgstr[0] "移動 {0} 個節點"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3391,31 +3392,31 @@
 msgstr "自動修正標籤"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:73
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:77
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr "無法建立目錄 {0}，自動儲存將會停用"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:139
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
 msgstr "無法建立檔案 {0}，將使用其他的檔案名稱"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:144
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "建立檔案時發生 IOError，自動儲存會被略過：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:166
 #, java-format
 msgid "Unable to delete old backup file {0}"
 msgstr "無法刪除舊的備份檔案 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:235
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
 msgstr "在建立已移除圖層的備份時發生錯誤：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:273
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:277
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
@@ -3434,15 +3435,15 @@
 msgstr "不合法的經度數值「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告：將偏好設定固定為「{0}」失敗"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "設定檔案第 {0} 行格式不良"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458
 #, java-format
 msgid ""
@@ -3451,5 +3452,5 @@
 msgstr "警告：初始化偏好設定失敗。偏好設定目錄「{0}」不是一個目錄。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461
 #, java-format
 msgid ""
@@ -3458,5 +3459,5 @@
 msgstr "<html>初始化偏好設定失敗。<br>偏好設定目錄「{0}」不是一個目錄。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469
 #, java-format
 msgid ""
@@ -3465,5 +3466,5 @@
 msgstr "警告：初始化偏好設定失敗。無法建立缺少的偏好設定目錄：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -3472,5 +3473,5 @@
 msgstr "<html>初始化偏好設定失敗。<br>無法建立缺少的偏好設定目錄：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -3478,5 +3479,5 @@
 msgstr "警告：缺少偏好設定檔案「{0}」。正在建立預設的偏好設定檔案。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #, java-format
 msgid ""
@@ -3485,5 +3486,5 @@
 msgstr "警告：以預設的偏好設定檔案取代現有的偏好設定檔案「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495
 #, java-format
 msgid ""
@@ -3492,5 +3493,5 @@
 msgstr "<html>初始化偏好設定失敗。<br>無法將偏好設定重設為預設值：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -3501,5 +3502,5 @@
 "偏好設定檔案。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518
 #, java-format
 msgid ""
@@ -3508,10 +3509,10 @@
 msgstr "警告：初始化偏好設定失敗。無法將偏好設定重設為預設值：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "錯誤：在書籤檔案「{1}」中有未預期的行「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554
 #, java-format
 msgid ""
@@ -3631,5 +3632,5 @@
 msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:650
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
 #, java-format
 msgid ""
@@ -3703,9 +3704,9 @@
 msgstr "不能將 changesetId > 0 指派給新的原型。changesetId 的數值為 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:752
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "ID = 0 的原型不能為不可視。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1348
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3713,5 +3714,5 @@
 msgstr "不能合併，因為參與的原型是新的但其他的卻不是"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1350
 #, java-format
 msgid ""
@@ -3898,16 +3899,35 @@
 msgstr "PUWG 2000 區 {0} (波蘭)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:124
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (瑞士)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:358
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:420
 msgid "UTM Zone"
 msgstr "UTM 區"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:439
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
+#, fuzzy
+msgid "South"
+msgstr "南"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
+#, fuzzy
+msgid "Hemisphere"
+msgstr "跳至那裡"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
+msgid "Offset 3.000.000m east"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
@@ -3930,9 +3950,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
 msgid "UTM Geodesic system"
 msgstr ""
@@ -3975,5 +3995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "railway"
 msgstr "鐵路"
@@ -3994,5 +4014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:805
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:806
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
@@ -4243,69 +4263,69 @@
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "將 url (lat=x&lon=y&zoom=z) 的位置下載為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Set the language"
 msgstr "設定語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "options provided as Java system properties"
 msgstr "選項提供為 Java 系統屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Change the folder for all user settings"
 msgstr "改變所有使用者設定值的資料夾"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4317,9 +4337,9 @@
 "      Java 選項以 MB 來指定分配到記憶體的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4327,59 +4347,68 @@
 msgstr "參數 --download、 --downloadgps  和 --selection 會以這個順序處理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用 --selection 請確定已載入某些資料。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:197
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
 msgid "Updating plugins..."
 msgstr "正在更新外掛程式..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Installing updated plugins"
 msgstr "正在安裝更新的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:216
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 msgid "Unsaved osm data"
 msgstr "未儲存的 osm 資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:255
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
 msgid "Restore"
 msgstr "還原"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, java-format
-msgid ""
-"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-"time. Do you want to restore data?"
+#, fuzzy
+msgid "Discard"
+msgstr "安全島"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
+#, java-format
+msgid "JOSM found {0} unsaved osm data layer. "
+msgid_plural "JOSM found {0} unsaved osm data layers. "
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, fuzzy
+msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
 "JOSM 發現 {0} 個未儲存的 osm 資料圖層。看起來上次 JOSM 當機了。您是否要還原資"
 "料？"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:312
 #, java-format
 msgid ""
@@ -4389,9 +4418,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:328
 msgid "Continue, try anyway"
 msgstr ""
@@ -4405,9 +4434,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
@@ -4529,23 +4559,23 @@
 msgstr "使用者："
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:385
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:402
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:386
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:403
 msgid "Layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:691
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "圖層「{0}」必須在圖層的清單中"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
 msgstr ""
@@ -4641,5 +4671,5 @@
 msgstr "點選以關閉此對話盒並放棄刪除此物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227
 msgid ""
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -4648,17 +4678,17 @@
 "<html>請以指定的縮放等級選擇一個<strong> OSM 拼貼的範圍</strong>。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234
 msgid "Zoom level:"
 msgstr "縮放等級："
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256
 msgid "from tile"
 msgstr "從拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "up to tile"
 msgstr "到拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436
 msgid ""
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4671,25 +4701,25 @@
 "i> 或 <i>zoom;x;y</i> 也是可以使用的。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
 msgid "Tile address:"
 msgstr "拼貼位址："
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499
 msgid "Apply the tile address"
 msgstr "套用這個拼貼位址"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558
 msgid "Please enter a tile address"
 msgstr "請輸入拼貼位址"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560
 msgid "The current value isn''t a valid tile address"
 msgstr "目前的數值不是有效的拼貼位址"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606
 msgid "Please enter a tile index"
 msgstr "請輸入拼貼索引"
 
-#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr "目前的數值在指定的縮放等級中是無法使用的拼貼索引"
@@ -5079,4 +5109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java:247
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
@@ -5159,4 +5190,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5173,4 +5205,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -5244,5 +5277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -5254,10 +5287,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "none"
 msgstr "沒有"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:3512
 msgid "all"
 msgstr "全部"
@@ -5338,5 +5371,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
@@ -5347,5 +5380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
@@ -5379,17 +5412,17 @@
 msgstr "尚未決定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
 msgid "Role:"
 msgstr "角色："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
 msgid "Enter a role for all relation memberships"
 msgstr "輸入所有關係成員的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
 msgid "Tag modified relations with "
 msgstr "標籤修改的關係為 "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5397,15 +5430,15 @@
 msgstr "<html>選擇以啟用輸入一個標籤可套用到<br>所有修改的關係。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
 msgctxt "tag"
 msgid "Key:"
 msgstr "鍵值："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr "<html>輸入標籤鍵值，例如 <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 #: build/specialmessages.java:85
@@ -5413,5 +5446,5 @@
 msgstr "數值："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -5419,5 +5452,5 @@
 "<html>輸入標籤數值，例如 <strong><tt>check members</tt></strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -5433,5 +5466,5 @@
 "代關係中原本的路徑。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -5447,5 +5480,5 @@
 "係中原本的節點。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 msgid "Apply this role to all members"
 msgstr "將這個角色套用到所有成員中"
@@ -5590,5 +5623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid ""
@@ -5705,5 +5738,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "E"
@@ -5711,5 +5744,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "H"
@@ -5717,5 +5750,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "Text"
@@ -5723,5 +5756,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
 msgctxt "filter"
 msgid "I"
@@ -5729,5 +5762,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:265
 msgctxt "filter"
 msgid "M"
@@ -5736,5 +5769,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "R"
@@ -5742,5 +5775,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "A"
@@ -5748,5 +5781,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "D"
@@ -5754,24 +5787,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:340
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>過濾條件已使用</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:376
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 物件已隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:384
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 物件已停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:387
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>關閉過濾條件對話盒以查看所有的物件。<p></html>"
@@ -5792,5 +5825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
@@ -5815,37 +5848,37 @@
 msgstr "進階的物件資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
 msgid "Enter the coordinates for the new node."
 msgstr "輸入新節點的座標"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Use decimal degrees."
 msgstr "使用十進位度數"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "負數表示西半球/南半球"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:182
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "請輸入有效的緯度範圍 -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:185
 msgid "Please enter a latitude in the range -90..90"
 msgstr "請輸入緯度範圍 -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:193
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "請輸入有效的經度範圍 -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:196
 msgid "Please enter a longitude in the range -180..180"
 msgstr "請輸入經度範圍 -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 msgid "Close the dialog and create a new node"
 msgstr "關閉此對話盒並建立新的節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 msgid "Close the dialog, do not create a new node"
 msgstr "關閉此對話盒，不要建立新的節點"
@@ -5901,9 +5934,9 @@
 msgstr "關於圖層的資訊"
 
-#. item "Land use/Quarry" text "Name"
+#. item "Annotation/Contact" text "Image"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3527
 msgid "Relations"
 msgstr "關係"
@@ -5951,10 +5984,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
 msgid "Download incomplete members of selected relations"
 msgstr "下載已選取關係的不完整成員"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:857
 msgid "Download incomplete members"
 msgstr "下載不完整的成員"
@@ -5974,37 +6007,37 @@
 msgstr "開啓選擇區域清單視窗。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304
 msgid "Search for objects"
 msgstr "搜尋物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:359
 msgid "Zoom to selection"
 msgstr "縮放至選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:393
 msgid "Zoom to selected element(s)"
 msgstr "縮放至選取的元件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
 msgid "Call editor for relation"
 msgstr "開啓關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425
 msgid "Call relation editor for selected relation"
 msgstr "開啓選取關係的關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "在關係清單中選擇"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "在關係清單中選擇。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -6013,32 +6046,32 @@
 msgstr "選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
 #, 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:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
 #, java-format
 msgid "Selection: {0}"
 msgstr "選擇區域：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
 msgid "Get detailed information on the internal state of the objects."
 msgstr "取得物件內部狀態的詳細資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:893
 msgid "Inspect"
 msgstr "檢查"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
 msgid "Undock the panel"
 msgstr "解鎖面板"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "點選以最小化/最大化面板內容"
@@ -6315,13 +6348,13 @@
 msgstr "沒有可縮放的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445
 msgid "The content of this changeset is not downloaded yet."
 msgstr "這個變更組合的內容尚未下載。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
 msgstr "立即下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
 msgstr "立即下載變更組合內容"
@@ -6433,4 +6466,8 @@
 #. <key key="highway" value="services" />
 #. <optional>
+#. item "Waypoints/Rest Area" label "Edit Rest Area"
+#. <space />
+#. <key key="highway" value="rest_area" />
+#. <optional>
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
 #. <space />
@@ -6449,6 +6486,4 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Water/Spring" label "Edit Spring"
-#. <key key="natural" value="spring" />
 #. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
@@ -6466,8 +6501,15 @@
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water/Water" label "Edit Water"
-#. <key key="natural" value="water" />
-#. item "Water/Water/Land" label "Edit Land"
-#. <key key="natural" value="land" />
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Water/Water/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
@@ -6478,4 +6520,10 @@
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
@@ -6490,33 +6538,22 @@
 #. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Water/Coastline" label "Edit Coastline"
-#. <key key="natural" value="coastline" />
-#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Shipping/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. item "Shipping/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Shipping/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Shipping/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Shipping/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Water/Dock" label "Edit Dock"
+#. item "Shipping/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Water/Dam" label "Edit Dam"
-#. <space />
-#. <key key="waterway" value="dam" />
-#. item "Waterway Point/Weir" label "Edit Weir"
-#. <space />
-#. <key key="waterway" value="weir" />
-#. item "Waterway Point/Waterfall" label "Edit Waterfall"
-#. <space />
-#. <key key="waterway" value="waterfall" />
-#. item "Waterway Point/Marina" label "Edit Marina"
-#. <key key="leisure" value="marina" />
-#. item "Waterway Point/Pier" label "Edit Pier"
-#. <key key="man_made" value="pier" />
-#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
-#. <key key="amenity" value="ferry_terminal" />
-#. item "Waterway Point/Slipway" label "Edit Slipway"
-#. <key key="leisure" value="slipway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
@@ -6540,12 +6577,22 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
+#. item "Car/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
+#. item "Car/Tyres" label "Edit Tyres"
+#. <key key="shop" value="tyres" />
 #. item "Car/Rental" label "Edit Car Rental"
 #. <key key="amenity" value="car_rental" />
 #. item "Car/Sharing" label "Edit Car Sharing"
 #. <key key="amenity" value="car_sharing" />
+#. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
+#. <key key="amenity" value="motorcycle_parking" />
+#. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
+#. <key key="shop" value="motorcycle" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
 #. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
@@ -6617,10 +6664,14 @@
 #. item "Tourism/Zoo" label "Edit Zoo"
 #. <key key="tourism" value="zoo" />
-#. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#. <key key="tourism" value="viewpoint" />
 #. item "Tourism/Theme Park" label "Edit Theme Park"
 #. <key key="tourism" value="theme_park" />
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
 #. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
@@ -6650,8 +6701,4 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
-#. item "Tourism/Shelter" label "Edit Shelter"
-#. <key key="amenity" value="shelter" />
-#. item "Tourism/Picnic Site" label "Edit Picnic Site"
-#. <key key="tourism" value="picnic_site" />
 #. item "Historic Places/Castle" label "Edit Castle"
 #. <key key="historic" value="castle" />
@@ -6714,6 +6761,4 @@
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
 #. <key key="sport" value="gymnastics" />
-#. item "Sport/Motor Sports" label "Edit Motor Sports"
-#. <key key="sport" value="motor" />
 #. item "Sport/Skating" label "Edit Skating"
 #. <key key="sport" value="skating" />
@@ -6766,4 +6811,16 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
+#. item "Motorsport/Motorsport" label "Edit Motorsport"
+#. <key key="sport" value="motor" />
+#. item "Motorsport/Karting" label "Edit Karting"
+#. <key key="sport" value="karting" />
+#. item "Motorsport/Motocross" label "Edit Motocross"
+#. <key key="sport" value="motocross" />
+#. item "Motorsport/Safety Training" label "Edit Safety Training"
+#. <key key="sport" value="safety_training" />
+#. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
+#. <key key="sport" value="model_aerodrome" />
+#. item "Motorsport/RC Car" label "Edit RC Car"
+#. <key key="sport" value="rc_car" />
 #. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
@@ -6828,32 +6885,40 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
-#. item "Shops/Car Dealer" label "Edit Car Shop"
-#. <key key="shop" value="car" />
-#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
-#. item "Shops/Supermarket" label "Edit Supermarket"
+#. item "Food/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Food/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Food/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Food/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Food/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Food/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Food/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Food/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
 #. item "Shops/Chemist" label "Edit Chemist"
 #. <key key="shop" value="chemist" />
-#. item "Shops/Convenience Store" label "Edit Convenience Store"
-#. <key key="shop" value="convenience" />
-#. item "Shops/Kiosk" label "Edit Kiosk"
-#. <key key="shop" value="kiosk" />
-#. item "Shops/Book Store" label "Edit Book Store"
-#. <key key="shop" value="books" />
-#. item "Shops/Travel Agency" label "Edit Travel Agency"
-#. <key key="shop" value="travel_agency" />
-#. item "Shops/Butcher" label "Edit Butcher"
-#. <key key="shop" value="butcher" />
-#. item "Shops/Baker" label "Edit Baker"
-#. <key key="shop" value="bakery" />
-#. item "Shops/Florist" label "Edit Florist"
-#. <key key="shop" value="florist" />
-#. item "Shops/Organic" label "Edit Organic Shop"
-#. <key key="shop" value="organic" />
-#. item "Shops/Alcohol" label "Edit Alcohol Shop"
-#. <key key="shop" value="alcohol" />
-#. item "Shops/Beverages" label "Edit Beverages Shop"
-#. <key key="shop" value="beverages" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Shops/Clothes" label "Edit Clothes Shop"
+#. <key key="shop" value="clothes" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Tailor" label "Edit Tailor"
+#. <key key="shop" value="tailor" />
 #. item "Shops/Computer" label "Edit Computer Shop"
 #. <key key="shop" value="computer" />
@@ -6862,6 +6927,8 @@
 #. item "Shops/Hifi" label "Edit Hifi Shop"
 #. <key key="shop" value="hifi" />
-#. item "Shops/Furniture" label "Edit Furniture Shop"
-#. <key key="shop" value="furniture" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
 #. item "Shops/Garden Centre" label "Edit Garden Centre"
 #. <key key="shop" value="garden_centre" />
@@ -6870,24 +6937,14 @@
 #. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
 #. <key key="shop" value="doityourself" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
 #. item "Shops/Stationery" label "Edit Stationery Shop"
 #. <key key="shop" value="stationery" />
-#. item "Shops/Hairdresser" label "Edit Hairdresser"
-#. <key key="shop" value="hairdresser" />
-#. item "Shops/Shoes" label "Edit Shoe Shop"
-#. <key key="shop" value="shoes" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Toys" label "Edit Toy Shop"
 #. <key key="shop" value="toys" />
-#. item "Shops/Video" label "Edit Video Shop"
-#. <key key="shop" value="video" />
-#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
-#. <key key="shop" value="dry_cleaning" />
-#. item "Shops/Laundry" label "Edit Laundry"
-#. <key key="shop" value="laundry" />
-#. item "Shops/Outdoor" label "Edit Outdoor Shop"
-#. <key key="shop" value="outdoor" />
-#. item "Shops/Sports" label "Edit Sports Shop"
-#. <key key="shop" value="sports" />
-#. item "Shops/Optician" label "Edit Optician"
-#. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
 #. <key key="amenity" value="bank" />
@@ -6902,82 +6959,82 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Geography/Places/Continent" label "Edit Continent"
+#. item "Geography/Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Geography/Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Geography/Places/Country" label "Edit Country"
+#. item "Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Geography/Places/State" label "Edit State"
+#. item "Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Geography/Places/Region" label "Edit Region"
+#. item "Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Geography/Places/County" label "Edit County"
+#. item "Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Geography/Places/City" label "Edit City"
+#. item "Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Geography/Places/Town" label "Edit Town"
+#. item "Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. item "Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Geography/Places/Village" label "Edit Village"
+#. item "Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. item "Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Geography/Places/Locality" label "Edit Locality"
+#. item "Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Geography/Places/Island" label "Edit Island"
+#. item "Geography/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Geography/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Geography/Places/Islet" label "Edit Islet"
+#. item "Geography/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
-#. <key key="natural" value="cave_entrance" />
-#. item "Geography/Places/Peak" label "Edit Peak"
-#. <key key="natural" value="peak" />
-#. item "Geography/Places/Glacier" label "Edit Glacier"
-#. <key key="natural" value="glacier" />
-#. item "Geography/Places/Volcano" label "Edit Volcano"
-#. <key key="natural" value="volcano" />
-#. item "Boundaries/National" label "Edit National Boundary"
-#. <space />
-#. <key key="boundary" value="national" />
-#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
-#. <space />
-#. <key key="boundary" value="administrative" />
-#. item "Boundaries/Civil" label "Edit Civil Boundary"
-#. <space />
-#. <key key="boundary" value="civil" />
-#. item "Boundaries/Political" label "Edit Political Boundary"
-#. <space />
-#. <key key="boundary" value="political" />
-#. item "Boundaries/National park" label "Edit National Park Boundary"
-#. <space />
-#. <key key="boundary" value="national_park" />
-#. item "Land use/Tree" label "Edit Tree"
+#. item "Nature/Tree" label "Edit Tree"
 #. <key key="natural" value="tree" />
-#. item "Land use/Wood" label "Edit Wood"
+#. item "Nature/Wood" label "Edit Wood"
 #. <key key="natural" value="wood" />
-#. item "Land use/Forest" label "Edit Forest Landuse"
+#. item "Nature/Forest" label "Edit Forest Landuse"
 #. <space />
 #. <key key="landuse" value="forest" />
-#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. item "Nature/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
-#. item "Land use/Scree" label "Edit Scree"
+#. item "Nature/Scree" label "Edit Scree"
 #. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
+#. item "Nature/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Nature/Scrub" label "Edit Scrub"
 #. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
+#. item "Nature/Heath" label "Edit Heath"
 #. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
@@ -7058,155 +7115,160 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/specialmessages.java:57 build/trans_presets.java:87
-#: build/trans_presets.java:123 build/trans_presets.java:163
-#: build/trans_presets.java:200 build/trans_presets.java:220
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:312 build/trans_presets.java:345
-#: build/trans_presets.java:364 build/trans_presets.java:413
-#: build/trans_presets.java:433 build/trans_presets.java:448
-#: build/trans_presets.java:463 build/trans_presets.java:486
-#: build/trans_presets.java:515 build/trans_presets.java:535
-#: build/trans_presets.java:558 build/trans_presets.java:580
-#: build/trans_presets.java:599 build/trans_presets.java:618
-#: build/trans_presets.java:636 build/trans_presets.java:645
-#: build/trans_presets.java:703 build/trans_presets.java:729
-#: build/trans_presets.java:738 build/trans_presets.java:798
-#: build/trans_presets.java:949 build/trans_presets.java:957
-#: build/trans_presets.java:965 build/trans_presets.java:973
-#: build/trans_presets.java:981 build/trans_presets.java:991
-#: build/trans_presets.java:999 build/trans_presets.java:1004
-#: build/trans_presets.java:1011 build/trans_presets.java:1018
-#: build/trans_presets.java:1023 build/trans_presets.java:1031
-#: build/trans_presets.java:1040 build/trans_presets.java:1046
-#: build/trans_presets.java:1052 build/trans_presets.java:1057
-#: build/trans_presets.java:1063 build/trans_presets.java:1069
-#: build/trans_presets.java:1078 build/trans_presets.java:1087
-#: build/trans_presets.java:1094 build/trans_presets.java:1102
-#: build/trans_presets.java:1115 build/trans_presets.java:1121
-#: build/trans_presets.java:1130 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1150
-#: build/trans_presets.java:1247 build/trans_presets.java:1298
-#: build/trans_presets.java:1304 build/trans_presets.java:1310
-#: build/trans_presets.java:1316 build/trans_presets.java:1322
-#: build/trans_presets.java:1328 build/trans_presets.java:1341
-#: build/trans_presets.java:1366 build/trans_presets.java:1381
-#: build/trans_presets.java:1387 build/trans_presets.java:1395
-#: build/trans_presets.java:1402 build/trans_presets.java:1411
-#: build/trans_presets.java:1419 build/trans_presets.java:1430
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1470 build/trans_presets.java:1482
-#: build/trans_presets.java:1493 build/trans_presets.java:1513
-#: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1613
-#: build/trans_presets.java:1630 build/trans_presets.java:1647
-#: build/trans_presets.java:1664 build/trans_presets.java:1681
-#: build/trans_presets.java:1698 build/trans_presets.java:1715
-#: build/trans_presets.java:1734 build/trans_presets.java:1755
-#: build/trans_presets.java:1774 build/trans_presets.java:1791
-#: build/trans_presets.java:1809 build/trans_presets.java:1827
-#: build/trans_presets.java:1844 build/trans_presets.java:1861
-#: build/trans_presets.java:1877 build/trans_presets.java:1884
-#: build/trans_presets.java:1892 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1912
-#: build/trans_presets.java:1919 build/trans_presets.java:1926
-#: build/trans_presets.java:1943 build/trans_presets.java:1951
-#: build/trans_presets.java:1970 build/trans_presets.java:1980
-#: build/trans_presets.java:1992 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2015
-#: build/trans_presets.java:2020 build/trans_presets.java:2028
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2058 build/trans_presets.java:2063
-#: build/trans_presets.java:2068 build/trans_presets.java:2075
-#: build/trans_presets.java:2081 build/trans_presets.java:2086
-#: build/trans_presets.java:2095 build/trans_presets.java:2104
-#: build/trans_presets.java:2113 build/trans_presets.java:2122
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2145 build/trans_presets.java:2151
-#: build/trans_presets.java:2157 build/trans_presets.java:2163
-#: build/trans_presets.java:2169 build/trans_presets.java:2175
-#: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2193 build/trans_presets.java:2199
-#: build/trans_presets.java:2205 build/trans_presets.java:2211
-#: build/trans_presets.java:2217 build/trans_presets.java:2223
-#: build/trans_presets.java:2229 build/trans_presets.java:2236
-#: build/trans_presets.java:2245 build/trans_presets.java:2253
-#: build/trans_presets.java:2259 build/trans_presets.java:2265
-#: build/trans_presets.java:2271 build/trans_presets.java:2277
-#: build/trans_presets.java:2283 build/trans_presets.java:2289
-#: build/trans_presets.java:2295 build/trans_presets.java:2301
-#: build/trans_presets.java:2307 build/trans_presets.java:2313
-#: build/trans_presets.java:2319 build/trans_presets.java:2325
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2381
-#: build/trans_presets.java:2387 build/trans_presets.java:2393
-#: build/trans_presets.java:2400 build/trans_presets.java:2407
-#: build/trans_presets.java:2415 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2435
-#: build/trans_presets.java:2441 build/trans_presets.java:2447
-#: build/trans_presets.java:2453 build/trans_presets.java:2461
-#: build/trans_presets.java:2468 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2490
-#: build/trans_presets.java:2522 build/trans_presets.java:2527
-#: build/trans_presets.java:2537 build/trans_presets.java:2542
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2606
-#: build/trans_presets.java:2613 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2768
-#: build/trans_presets.java:2775 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2801 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: 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:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2902 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2935
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2998 build/trans_presets.java:3005
-#: build/trans_presets.java:3025 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3048
-#: build/trans_presets.java:3054 build/trans_presets.java:3060
-#: build/trans_presets.java:3067 build/trans_presets.java:3074
-#: build/trans_presets.java:3081 build/trans_presets.java:3087
-#: build/trans_presets.java:3093 build/trans_presets.java:3101
-#: build/trans_presets.java:3108 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3128
-#: build/trans_presets.java:3135 build/trans_presets.java:3142
-#: build/trans_presets.java:3151 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3184
-#: build/trans_presets.java:3194 build/trans_presets.java:3203
-#: build/trans_presets.java:3209 build/trans_presets.java:3215
-#: build/trans_presets.java:3220 build/trans_presets.java:3226
-#: build/trans_presets.java:3232 build/trans_presets.java:3241
-#: build/trans_presets.java:3247 build/trans_presets.java:3253
-#: build/trans_presets.java:3259 build/trans_presets.java:3265
-#: build/trans_presets.java:3271 build/trans_presets.java:3277
-#: build/trans_presets.java:3284 build/trans_presets.java:3290
-#: build/trans_presets.java:3295 build/trans_presets.java:3302
-#: build/trans_presets.java:3309 build/trans_presets.java:3315
-#: build/trans_presets.java:3324 build/trans_presets.java:3332
-#: build/trans_presets.java:3338 build/trans_presets.java:3344
-#: build/trans_presets.java:3351 build/trans_presets.java:3357
-#: build/trans_presets.java:3364 build/trans_presets.java:3370
-#: build/trans_presets.java:3376 build/trans_presets.java:3382
-#: build/trans_presets.java:3388 build/trans_presets.java:3400
-#: build/trans_presets.java:3414 build/trans_presets.java:3433
-#: build/trans_presets.java:3447
+#: build/specialmessages.java:57 build/trans_presets.java:88
+#: build/trans_presets.java:124 build/trans_presets.java:164
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:239 build/trans_presets.java:257
+#: build/trans_presets.java:275 build/trans_presets.java:293
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:365 build/trans_presets.java:414
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:464 build/trans_presets.java:487
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:638 build/trans_presets.java:647
+#: build/trans_presets.java:657 build/trans_presets.java:718
+#: build/trans_presets.java:742 build/trans_presets.java:751
+#: build/trans_presets.java:811 build/trans_presets.java:964
+#: build/trans_presets.java:972 build/trans_presets.java:980
+#: build/trans_presets.java:988 build/trans_presets.java:998
+#: build/trans_presets.java:1006 build/trans_presets.java:1012
+#: build/trans_presets.java:1019 build/trans_presets.java:1026
+#: build/trans_presets.java:1033 build/trans_presets.java:1040
+#: build/trans_presets.java:1045 build/trans_presets.java:1052
+#: build/trans_presets.java:1057 build/trans_presets.java:1063
+#: build/trans_presets.java:1070 build/trans_presets.java:1080
+#: build/trans_presets.java:1086 build/trans_presets.java:1092
+#: build/trans_presets.java:1097 build/trans_presets.java:1103
+#: build/trans_presets.java:1111 build/trans_presets.java:1120
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1150 build/trans_presets.java:1157
+#: build/trans_presets.java:1164 build/trans_presets.java:1261
+#: build/trans_presets.java:1312 build/trans_presets.java:1318
+#: build/trans_presets.java:1324 build/trans_presets.java:1330
+#: build/trans_presets.java:1337 build/trans_presets.java:1343
+#: build/trans_presets.java:1356 build/trans_presets.java:1382
+#: build/trans_presets.java:1397 build/trans_presets.java:1406
+#: build/trans_presets.java:1412 build/trans_presets.java:1420
+#: build/trans_presets.java:1435 build/trans_presets.java:1444
+#: build/trans_presets.java:1454 build/trans_presets.java:1463
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1500 build/trans_presets.java:1511
+#: build/trans_presets.java:1521 build/trans_presets.java:1531
+#: build/trans_presets.java:1551 build/trans_presets.java:1563
+#: build/trans_presets.java:1574 build/trans_presets.java:1594
+#: build/trans_presets.java:1603 build/trans_presets.java:1659
+#: build/trans_presets.java:1676 build/trans_presets.java:1694
+#: build/trans_presets.java:1711 build/trans_presets.java:1728
+#: build/trans_presets.java:1745 build/trans_presets.java:1762
+#: build/trans_presets.java:1780 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1837
+#: build/trans_presets.java:1856 build/trans_presets.java:1873
+#: build/trans_presets.java:1892 build/trans_presets.java:1910
+#: build/trans_presets.java:1927 build/trans_presets.java:1944
+#: build/trans_presets.java:1960 build/trans_presets.java:1967
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1988 build/trans_presets.java:1995
+#: build/trans_presets.java:2001 build/trans_presets.java:2007
+#: build/trans_presets.java:2015 build/trans_presets.java:2022
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2066 build/trans_presets.java:2076
+#: build/trans_presets.java:2088 build/trans_presets.java:2098
+#: build/trans_presets.java:2103 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2141 build/trans_presets.java:2146
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2169
+#: build/trans_presets.java:2178 build/trans_presets.java:2187
+#: build/trans_presets.java:2196 build/trans_presets.java:2205
+#: build/trans_presets.java:2214 build/trans_presets.java:2220
+#: build/trans_presets.java:2228 build/trans_presets.java:2234
+#: build/trans_presets.java:2240 build/trans_presets.java:2246
+#: build/trans_presets.java:2252 build/trans_presets.java:2258
+#: build/trans_presets.java:2264 build/trans_presets.java:2270
+#: build/trans_presets.java:2276 build/trans_presets.java:2282
+#: build/trans_presets.java:2288 build/trans_presets.java:2294
+#: build/trans_presets.java:2300 build/trans_presets.java:2306
+#: build/trans_presets.java:2313 build/trans_presets.java:2322
+#: build/trans_presets.java:2330 build/trans_presets.java:2336
+#: build/trans_presets.java:2342 build/trans_presets.java:2348
+#: build/trans_presets.java:2354 build/trans_presets.java:2360
+#: build/trans_presets.java:2366 build/trans_presets.java:2372
+#: build/trans_presets.java:2378 build/trans_presets.java:2384
+#: build/trans_presets.java:2390 build/trans_presets.java:2396
+#: build/trans_presets.java:2402 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2426 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2452 build/trans_presets.java:2458
+#: build/trans_presets.java:2464 build/trans_presets.java:2470
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2497 build/trans_presets.java:2503
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2523 build/trans_presets.java:2531
+#: build/trans_presets.java:2538 build/trans_presets.java:2544
+#: build/trans_presets.java:2551 build/trans_presets.java:2557
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2577 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2606 build/trans_presets.java:2616
+#: build/trans_presets.java:2621 build/trans_presets.java:2631
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2808 build/trans_presets.java:2815
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2842 build/trans_presets.java:2849
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2883 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2915
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2974 build/trans_presets.java:2981
+#: build/trans_presets.java:2988 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3050
+#: build/trans_presets.java:3059 build/trans_presets.java:3074
+#: build/trans_presets.java:3080 build/trans_presets.java:3088
+#: build/trans_presets.java:3095 build/trans_presets.java:3122
+#: build/trans_presets.java:3133 build/trans_presets.java:3139
+#: build/trans_presets.java:3145 build/trans_presets.java:3151
+#: build/trans_presets.java:3157 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3177
+#: build/trans_presets.java:3183 build/trans_presets.java:3189
+#: build/trans_presets.java:3196 build/trans_presets.java:3203
+#: build/trans_presets.java:3210 build/trans_presets.java:3216
+#: build/trans_presets.java:3222 build/trans_presets.java:3230
+#: build/trans_presets.java:3238 build/trans_presets.java:3245
+#: build/trans_presets.java:3252 build/trans_presets.java:3259
+#: build/trans_presets.java:3267 build/trans_presets.java:3274
+#: build/trans_presets.java:3283 build/trans_presets.java:3293
+#: build/trans_presets.java:3302 build/trans_presets.java:3308
+#: build/trans_presets.java:3314 build/trans_presets.java:3320
+#: build/trans_presets.java:3325 build/trans_presets.java:3331
+#: build/trans_presets.java:3341 build/trans_presets.java:3347
+#: build/trans_presets.java:3353 build/trans_presets.java:3359
+#: build/trans_presets.java:3365 build/trans_presets.java:3371
+#: build/trans_presets.java:3377 build/trans_presets.java:3384
+#: build/trans_presets.java:3390 build/trans_presets.java:3395
+#: build/trans_presets.java:3402 build/trans_presets.java:3409
+#: build/trans_presets.java:3415 build/trans_presets.java:3424
+#: build/trans_presets.java:3432 build/trans_presets.java:3438
+#: build/trans_presets.java:3444 build/trans_presets.java:3451
+#: build/trans_presets.java:3457 build/trans_presets.java:3464
+#: build/trans_presets.java:3470 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3488
+#: build/trans_presets.java:3535 build/trans_presets.java:3549
+#: build/trans_presets.java:3568 build/trans_presets.java:3582
 msgid "Name"
 msgstr "名稱"
@@ -7648,4 +7710,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
 msgstr "<不同>"
@@ -8156,17 +8219,17 @@
 msgstr "警告：因為工作已取消，忽略例外。例外為：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
 msgstr "包含父關係的直接子項"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
 msgstr "載入上層關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
 msgstr "正在載入上層關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
 msgstr "編輯目前選取的關係"
@@ -8447,4 +8510,5 @@
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Motorcycle/Parking" text "Capacity"
 #. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Surveillance" text "Name"
@@ -8452,15 +8516,15 @@
 #. <key key="power" value="generator" />
 #. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
+#. item "Nature/Tree" text "Name"
+#. item "Nature/Wood" text "Name"
+#. item "Nature/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
-#: build/specialmessages.java:71 build/trans_presets.java:411
-#: build/trans_presets.java:669 build/trans_presets.java:678
-#: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2562 build/trans_presets.java:2596
-#: build/trans_presets.java:2605 build/trans_presets.java:2631
-#: build/trans_presets.java:3185 build/trans_presets.java:3195
-#: build/trans_presets.java:3204
+#: build/specialmessages.java:71 build/trans_presets.java:412
+#: build/trans_presets.java:691 build/trans_presets.java:700
+#: build/trans_presets.java:1081 build/trans_presets.java:1384
+#: build/trans_presets.java:1456 build/trans_presets.java:2656
+#: build/trans_presets.java:2690 build/trans_presets.java:2699
+#: build/trans_presets.java:2725 build/trans_presets.java:3284
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
 msgid "Type"
 msgstr "類型"
@@ -8479,16 +8543,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:499
-#: build/trans_presets.java:542 build/trans_presets.java:654
-#: build/trans_presets.java:669 build/trans_presets.java:1278
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:500
+#: build/trans_presets.java:543 build/trans_presets.java:669
+#: build/trans_presets.java:691 build/trans_presets.java:1292
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
 msgid "unknown"
 msgstr "不明"
@@ -9082,5 +9146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:953
 msgid "Launch a file chooser to select a file"
 msgstr "開啟檔案選擇器來選擇檔案"
@@ -9307,20 +9371,20 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:88 build/trans_presets.java:105
-#: build/trans_presets.java:124 build/trans_presets.java:143
-#: build/trans_presets.java:164 build/trans_presets.java:180
-#: build/trans_presets.java:201 build/trans_presets.java:221
-#: build/trans_presets.java:245 build/trans_presets.java:263
-#: build/trans_presets.java:281 build/trans_presets.java:299
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:370 build/trans_presets.java:419
-#: build/trans_presets.java:434 build/trans_presets.java:449
-#: build/trans_presets.java:472 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:565 build/trans_presets.java:588
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:958 build/trans_presets.java:966
-#: build/trans_presets.java:974 build/trans_presets.java:982
-#: build/trans_presets.java:992 build/trans_presets.java:1253
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:282 build/trans_presets.java:300
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:420
+#: build/trans_presets.java:435 build/trans_presets.java:450
+#: build/trans_presets.java:473 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:989
+#: build/trans_presets.java:999 build/trans_presets.java:1267
 msgid "Layer"
 msgstr "層級"
@@ -9781,5 +9845,60 @@
 msgstr[0] "{0} 個物件要刪除："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "名稱：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} 軌跡"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3585
+msgid "Description"
+msgstr "描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+msgid "Timespan"
+msgstr "時間跨度"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:140
+msgid "Length"
+msgstr "長度"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#, fuzzy, java-format
+msgid "Length: {0}"
+msgstr "長度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} 路線， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} 航點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
@@ -9787,59 +9906,16 @@
 msgstr "gps 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr "名稱：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr "描述：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#, java-format
-msgid "{0} track"
-msgid_plural "{0} tracks"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
+#, fuzzy, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
 msgstr[0] "{0} 軌跡"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3450
-msgid "Description"
-msgstr "描述"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-msgid "Timespan"
-msgstr "時間跨度"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
-msgid "Length"
-msgstr "長度"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
-msgid "Length: "
-msgstr "長度： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} 路線， "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} 航點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:638
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9849,10 +9925,10 @@
 "軌跡，請看這裡："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -9863,7 +9939,7 @@
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:685
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:723
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9871,10 +9947,10 @@
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:693
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:696
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9882,10 +9958,10 @@
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9893,21 +9969,21 @@
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:711
 msgid "Download near:"
 msgstr "下載接近："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track only"
 msgstr "只有軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "waypoints only"
 msgstr "只有航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
 msgid "track and waypoints"
 msgstr "軌跡與航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:838
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9918,9 +9994,9 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1107
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9928,5 +10004,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1114
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9934,30 +10010,30 @@
 msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1236
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 msgid "Use global settings."
 msgstr "使用全域設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Draw lines between points for this layer."
 msgstr "在這個圖層的各點之間繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 msgid "Do not draw lines between points for this layer."
 msgstr "在這個圖層的各點之間不要繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
 msgid "Select line drawing options"
 msgstr "選擇線條繪製選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1278
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
@@ -9965,5 +10041,5 @@
 msgstr "自訂顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
@@ -9972,5 +10048,5 @@
 msgstr "預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1289
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
@@ -9979,18 +10055,18 @@
 msgstr "選擇一種顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
 msgid "Markers From Named Points"
 msgstr "已命名點的標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1329
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名軌跡點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1341
 msgid "Import Audio"
 msgstr "匯入音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1346
 #, java-format
 msgid ""
@@ -10002,23 +10078,23 @@
 "記，我們不能將它們與聲音資料關聯。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
 msgid "Import not possible"
 msgstr "不可能匯入"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1377
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音效檔案 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音效標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1430
 msgid "Import images"
 msgstr "匯入圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1435
 #, java-format
 msgid ""
@@ -10453,15 +10529,15 @@
 msgstr "無法刪除圖片檔案。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
 msgid "No image"
 msgstr "沒有圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
 #, java-format
 msgid "Loading {0}"
 msgstr "正在載入 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
 #, java-format
 msgid "Error on file {0}"
@@ -11438,4 +11514,48 @@
 msgid "Voice recorder calibration"
 msgstr "錄音機校準"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
+#, fuzzy
+msgid "Auto save interval (seconds)"
+msgstr "更新間隔 (以日計)："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
+#, fuzzy, java-format
+msgid "Default value: {0}"
+msgstr "預設值是「{0}」。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
+msgid "Auto saved files per layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
+msgid ""
+"<i>(Autosave stores the changed data layers in periodic intervals. The "
+"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
+"tries to recover the unsaved changes on next start.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
+msgid "Keep backup files when saving data layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
+msgid "When saving, keep backup files ending with a ~"
+msgstr "儲存時，在備份檔案名稱的結尾加上 ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
+msgid ""
+"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
+"the file name and saves it in the same folder.)</i>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "File backup"
+msgstr "檔案備份"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
+msgid "Configure whether to create backup files"
+msgstr "設定是否建立備份檔案"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
@@ -11519,5 +11639,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1347
 msgid "Car"
 msgstr "汽車"
@@ -11536,16 +11656,16 @@
 #. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Email Address"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:387 build/trans_presets.java:497
-#: build/trans_presets.java:754 build/trans_presets.java:773
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:926
-#: build/trans_presets.java:935 build/trans_presets.java:1406
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:388 build/trans_presets.java:498
+#: build/trans_presets.java:767 build/trans_presets.java:786
+#: build/trans_presets.java:800 build/trans_presets.java:822
+#: build/trans_presets.java:859 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:908 build/trans_presets.java:920
+#: build/trans_presets.java:930 build/trans_presets.java:939
+#: build/trans_presets.java:948 build/trans_presets.java:1480
+#: build/trans_presets.java:1553
 msgid "Bicycle"
 msgstr "單車"
@@ -11579,12 +11699,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:388 build/trans_presets.java:496
-#: build/trans_presets.java:753 build/trans_presets.java:772
-#: build/trans_presets.java:786 build/trans_presets.java:808
-#: build/trans_presets.java:845 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:894 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:925
-#: build/trans_presets.java:934
+#: build/trans_presets.java:389 build/trans_presets.java:497
+#: build/trans_presets.java:766 build/trans_presets.java:785
+#: build/trans_presets.java:799 build/trans_presets.java:821
+#: build/trans_presets.java:858 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:907 build/trans_presets.java:919
+#: build/trans_presets.java:929 build/trans_presets.java:938
+#: build/trans_presets.java:947
 msgid "Foot"
 msgstr "步行"
@@ -11830,18 +11950,18 @@
 msgstr "預設值（自動決定）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
 msgid "Enable built-in defaults"
 msgstr "啟用內建預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:39
 msgid "Enable built-in icon defaults"
 msgstr "啟用內建圖示預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
 msgid "Used style"
 msgstr "使用者樣式"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:70
 msgid "Map Paint Styles"
 msgstr "地圖繪製樣式"
@@ -12159,27 +12279,19 @@
 msgstr "無法使用投影法 {0}。改用麥卡托投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
 msgstr "驗證"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
 msgstr "代理伺服器設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
-msgid "File backup"
-msgstr "檔案備份"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr "設定您的身分識別與如何在 OSM 伺服器驗證"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
 msgstr "設定是否使用代理伺服器"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
-msgid "Configure whether to create backup files"
-msgstr "設定是否建立備份檔案"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -12296,6 +12408,15 @@
 "{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
+#, fuzzy
+msgid "Internal style"
+msgstr "外部工具"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+msgid "Internal style to be used as base for runtime switchable overlay styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:819
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
@@ -12533,12 +12654,4 @@
 "驗證」。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
-msgid "Keep backup files"
-msgstr "保留備份檔案"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
-msgid "When saving, keep backup files ending with a ~"
-msgstr "儲存時，在備份檔案名稱的結尾加上 ~"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
@@ -12725,5 +12838,5 @@
 msgstr "加入新標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:370
 #, java-format
 msgid ""
@@ -12733,49 +12846,49 @@
 "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "更多關於這個功能的資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明的必需品：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:594
 msgid "Available roles"
 msgstr "可用的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 msgid "role"
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:596
 msgid "count"
 msgstr "計次"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:597
 msgid "elements"
 msgstr "元素"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
 msgid "Optional Attributes:"
 msgstr "額外屬性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:710
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Preset role element without parent"
 msgstr "沒有父項的預設組合角色元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12785,15 +12898,15 @@
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:829
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:870
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:933
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12802,17 +12915,17 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:936
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:938
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1022
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13423,5 +13536,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
@@ -13523,5 +13636,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
@@ -13530,5 +13643,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:135
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
@@ -13597,5 +13710,5 @@
 msgstr "檔案「{0}」不存在"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
@@ -13607,10 +13720,10 @@
 "maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "發現 XML 元素 <nd> 並未做為元素 <way> 的直接子項。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:193
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
@@ -13618,5 +13731,5 @@
 msgstr "路徑 {1} 的 <nd> 缺少必要的屬性「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, java-format
@@ -13624,5 +13737,5 @@
 msgstr "元素 <nd> 的屬性「ref」有不合格的數值。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
@@ -13630,10 +13743,10 @@
 msgstr "刪除的路徑 {0} 包含節點"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr "發現 XML 元素 <member> 並未做為元素 <relation> 的直接子項。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
@@ -13641,5 +13754,5 @@
 msgstr "在關係 {0} 的成員缺少屬性「ref」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
@@ -13647,5 +13760,5 @@
 msgstr "在關係 {0} 的成員屬性「ref」有不合格的數值。得到 {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
@@ -13653,5 +13766,5 @@
 msgstr "在關係 {1} 的成員 {0} 缺少屬性「type」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
@@ -13660,10 +13773,10 @@
 msgstr "在關係 {1} 的成員 {0} 屬性「type」有不合格的數值。得到 {2}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "不完整的 <member>> 規格，ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
@@ -13671,9 +13784,9 @@
 msgstr "刪除的關係 {0} 包含成員"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
 msgid "Missing key or value attribute in tag."
 msgstr "標籤中缺少設定鍵或數值屬性。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
@@ -13681,11 +13794,11 @@
 msgstr "在輸入串流中發現未定義的元素「{0}」。正在略過。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:300
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "不合法的物件，id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
@@ -13697,8 +13810,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
@@ -13714,5 +13827,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, java-format
@@ -13720,5 +13833,5 @@
 msgstr "不明或不支援的 API 版本。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
@@ -13727,6 +13840,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
@@ -13738,6 +13851,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
@@ -13746,5 +13859,5 @@
 msgstr "屬性「changeset」有不合格的數值。得到「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
@@ -13752,5 +13865,5 @@
 msgstr "缺少必要的屬性「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
@@ -13758,5 +13871,5 @@
 msgstr "屬性「{0}」有不合格的 long 數值。得到「{1}」。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
@@ -13765,5 +13878,5 @@
 msgstr "外部 ID「{0}」的路徑包含了缺少的外部 ID「{1}」的節點。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
@@ -13771,5 +13884,5 @@
 msgstr "刪除的節點 {0} 是路徑 {1} 的一部分"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:452
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
@@ -13781,5 +13894,5 @@
 "了。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
@@ -13789,5 +13902,5 @@
 msgstr "外部 id「{0}」的關係包含了缺少的外部 id「{1}」的原型。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
@@ -13795,17 +13908,17 @@
 msgstr "刪除的成員 {0} 正由關係 {1} 使用"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Prepare OSM data..."
 msgstr "準備 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:559
 msgid "Parsing OSM data..."
 msgstr "正在分析 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:565
 msgid "Preparing data set..."
 msgstr "正在準備資料組合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:581
 #, java-format
 msgid "Line {0} column {1}: "
@@ -14305,11 +14418,11 @@
 msgstr "下載外掛程式清單..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "正從「{0}」下載外掛程式清單"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
 #, java-format
 msgid ""
@@ -14320,16 +14433,16 @@
 "單。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "正在將外掛程式清單寫入本地端快取「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:315
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "正在分析網站「{0}」的外掛程式清單"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
 #, java-format
 msgid ""
@@ -14338,5 +14451,5 @@
 msgstr "無法解析網站「{0}」的外掛程式清單文件。正在略過網站。例外為：{1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:352
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -14357,13 +14470,13 @@
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
 #.
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Report Bug"
 msgstr "回報程式錯誤"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14374,9 +14487,9 @@
 "請考慮不吝回報錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:81
 msgid "Unexpected Exception"
 msgstr "未預期的例外"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug report make "
@@ -14385,5 +14498,5 @@
 "您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
 msgid ""
 "You should also update your plugins. If neither of those help please file a "
@@ -14393,5 +14506,5 @@
 "錯誤："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
 msgid ""
 "There the error information provided below should already be filled in for "
@@ -14402,5 +14515,5 @@
 "一些。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:141
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
@@ -14408,9 +14521,9 @@
 msgstr "另外，如果這些都不行您也可以在這個 URL 自行填寫資訊："
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:148
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "（該文字已複製到您的剪貼簿中。）"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:163
 msgid "You have encountered a bug in JOSM"
 msgstr "您遇到了 JOSM 的程式錯誤"
@@ -14647,5 +14760,5 @@
 "<br><br>錯誤的訊息為：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:487
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14699,5 +14812,5 @@
 msgstr "未使用的"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14710,5 +14823,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
 msgid ""
 "This action will have no shortcut.\n"
@@ -14718,5 +14831,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
 #, java-format
 msgid ""
@@ -14727,5 +14840,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "（提示：您可以在偏好設定中編輯捷徑鍵。）"
@@ -14831,5 +14944,5 @@
 #. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "Visibility"
 msgstr "可見狀態"
@@ -14915,10 +15028,62 @@
 msgstr "上傳軌跡至 openstreetmap.org"
 
-#. item "Man-Made/Buildings/Addresses" text "Country code"
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#, fuzzy
+msgid "edit opening_hours"
+msgstr "開放時間"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+msgid "edit time-tag of selcted Element in a graphical interface"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
+#, fuzzy
+msgid "Change properties of 1 object"
+msgstr "改變屬性至 {0} 個物件"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
+#, java-format
+msgid "You have {0} Elements selected. But you can edit only one element!"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#, fuzzy
+msgid "Choose key"
+msgstr "選擇"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#, fuzzy, java-format
+msgid "apply {0}"
+msgstr "路徑 {0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+msgid "There is something wrong in the value near:"
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#, fuzzy, java-format
+msgid "Info: {0}"
+msgstr "工具：{0}"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+msgid "Correct the value manually and than press Enter."
+msgstr ""
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#, fuzzy
+msgid "Error in timeformat"
+msgstr "過濾條件發生錯誤"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
+#, fuzzy
+msgid "open end"
+msgstr "開啟"
+
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:3507
 msgid "Address Interpolation"
 msgstr "地址填寫"
@@ -15090,58 +15255,59 @@
 msgstr "對齊路徑"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
-msgid ""
-"You cannot align connected segments.\n"
-"Please select two segments that don''t share any nodes."
-msgstr ""
-"您不能對齊相互連接的區段。\n"
-"請選取兩個沒有共用任何節點的區段。"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+msgid ""
+"Please select two segments that don''t share any nodes\n"
+" or put the pivot on their common node.\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93
+#, fuzzy
+msgid "AlignWayS: Alignment not possible"
+msgstr "AlignWayS 訊息"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
+#, fuzzy
+msgid "Aligning would result nodes outside the world.\n"
+msgstr ""
+"對齊會造成節點掉出世界之外。\n"
+"您的動作被還原了。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
+msgid "I''m ready!"
+msgstr "準備就緒！"
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:172
+msgid "AlignWays Tips"
+msgstr "AlignWays 密訣"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "對齊路徑模式"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
+msgid "Align way segment"
+msgstr "對齊路徑區段"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "參數「{0}」不能為 null"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"要對齊的區段不能和參考用區段是同一個。\n"
+"請選擇不同的區段來對齊。"
+
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
 msgstr "AlignWayS 訊息"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
-msgid ""
-"Aligning would result nodes outside the world.\n"
-"Your action is being reverted."
-msgstr ""
-"對齊會造成節點掉出世界之外。\n"
-"您的動作被還原了。"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
-msgid "I''m ready!"
-msgstr "準備就緒！"
-
-#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
-#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
-msgid "AlignWays Tips"
-msgstr "AlignWays 密訣"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
-msgid "Align Ways mode"
-msgstr "對齊路徑模式"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
-msgid "Align way segment"
-msgstr "對齊路徑區段"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "參數「{0}」不能為 null"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
-msgid ""
-"Segment to be aligned cannot be the same with the reference segment.\n"
-"Please choose a different segment to be aligned."
-msgstr ""
-"要對齊的區段不能和參考用區段是同一個。\n"
-"請選擇不同的區段來對齊。"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -15275,27 +15441,8 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-"<b>Tools</b>\n"
-" menu or may want to place the action on the <b>toolbar</b>.\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-msgstr ""
-"<html>\n"
-"<div style=\"font-family:sans-serif\">\n"
-"<ul>\n"
-"  <li><b>對齊區段。</b> 請按 <b><i><span style=\"color:green\">Shift-A</"
-"span></i></b>。另外您可以在<b>工具</b>選單找到這個指令\n"
-"，也可以把這個動作放置到<b>工具列</b>上。\n"
-"  </li>\n"
-"</ul>\n"
-"</div>\n"
-"</html>\n"
-"\n"
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
 msgid ""
 "<html>\n"
@@ -15316,5 +15463,5 @@
 "\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
 msgid "Don''t show this again"
 msgstr "不要再次顯示這個訊息"
@@ -15427,5 +15574,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2489
 msgid "Buildings"
 msgstr "建築物"
@@ -15676,5 +15823,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2562 build/trans_style.java:1018
+#: build/trans_presets.java:2656 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3533
@@ -16100,8 +16247,4 @@
 msgstr "東"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
-msgid "North"
-msgstr "北"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 msgid "I use the mouse"
@@ -16219,6 +16362,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Blank Layer"
 msgstr "空白圖層"
@@ -17586,5 +17729,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1503
 msgid "Public Transport"
 msgstr "大眾運輸"
@@ -17628,48 +17771,53 @@
 msgstr "軌跡"
 
-#. item "Ways/Steps" text "Width (meters)"
+#. item "Ways/Steps" text "Amount of Steps"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:630
+#: build/trans_presets.java:632
 msgid "Waypoints"
 msgstr "路標"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "load data from API"
 msgstr "從 API 載入資料"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "import data from URL"
+msgstr "資料已從 {0} 匯入"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "create new objects"
 msgstr "建立新的物件"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "change the selection"
 msgstr "改變選擇區域"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "change the viewport"
 msgstr "改變檢視連接埠"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "read protocol version"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "confirm all Remote Control actions manually"
 msgstr "手動確認所有的遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "允許 JOSM 被其他應用程式控制的外掛程式。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Remote Control"
 msgstr "遠端控制"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Settings for the Remote Control plugin."
 msgstr "遠端控制外掛程式的設定值。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17680,34 +17828,34 @@
 "照了外部應用程式與此外掛程式的溝通。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:47
 msgid "Permitted actions"
 msgstr "准許的動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:120
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:139
 msgid "Do you want to allow this?"
 msgstr "您是否要允許這個？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:121
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestHandler.java:140
 msgid "Confirm Remote Control action"
 msgstr "確認遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
 msgstr "遠端控制被要求建立新的節點。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/ImportHandler.java:42
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "遠端控制被要求自下列 URL 匯入資料："
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:44
 msgid "Remote Control has been asked to load data from the API."
 msgstr "遠端控制被要求自 API 下載資料。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/LoadAndZoomHandler.java:45
 #, java-format
 msgid "Request details: {0}"
 msgstr "要求的詳細資料：{0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/handler/VersionHandler.java:32
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -17932,58 +18080,58 @@
 msgstr "刪除區域中不必要的節點。"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:136
 msgid "Slippy Map"
 msgstr "快速地圖"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:147
 msgid "Auto Zoom"
 msgstr "自動縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:156
 msgid "Load Tile"
 msgstr "載入拼貼"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:166
 msgid "Show Tile Info"
 msgstr "顯示拼貼資訊"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:188
 msgid "Load All Tiles"
 msgstr "載入所有拼貼"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:197
 msgid "Increase zoom"
 msgstr "增加縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:205
 msgid "Decrease zoom"
 msgstr "減少縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:215
 msgid "Snap to tile size"
 msgstr "貼緊拼貼大小"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:231
 msgid "Flush Tile Cache"
 msgstr "清除拼貼快取"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:667
 msgid "image "
 msgstr "圖片 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
 msgid "autozoom"
 msgstr "自動縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autoload tiles"
 msgstr "自動載入拼貼"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "SlippyMap"
 msgstr "快速地圖"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Settings for the SlippyMap plugin."
 msgstr "快速地圖外掛程式的設定值。"
@@ -18266,11 +18414,10 @@
 msgstr "連棟建築"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
 msgid "Edit OpenSeaMap"
-msgstr "編輯油管"
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
 msgid "Seamark Editor"
 msgstr ""
@@ -19389,5 +19536,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3528
 msgid "Multipolygon"
 msgstr "多重多邊形"
@@ -19509,59 +19656,59 @@
 msgstr "重疊的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
 msgid "Relation checker :"
 msgstr "關係檢查程式："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:43
 msgid "This plugin checks for errors in relations."
 msgstr "這個外掛程式會檢查在關係中的錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:113
 msgid "Relation type is unknown"
 msgstr "關係類型不明"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:143
 msgid "Relation is empty"
 msgstr "關係是空白的"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153
 msgid "<empty>"
 msgstr "<空白>"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
 #, java-format
 msgid "Role {0} missing"
 msgstr "缺少角色 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:182
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:199
 msgid "Role verification problem"
 msgstr "角色驗證問題"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
 #, java-format
 msgid "Number of {0} roles too low ({1})"
 msgstr "{0} 角色的編號太低 ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
 #, java-format
 msgid "Number of {0} roles too high ({1})"
 msgstr "{0} 角色的編號太高 ({1})"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
 #, java-format
 msgid "Member for role {0} of wrong type"
 msgstr "角色 {0} 成員的類型錯誤"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
 #, java-format
 msgid "Role {0} unknown"
 msgstr "不明的角色 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
 msgid "Empty role found"
 msgstr "發現空白角色"
@@ -20044,144 +20191,140 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% 的 GPS 軌跡"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "顯示目前在影片中的位置"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Import Video"
 msgstr "匯入影片"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
 msgid "Sync a video against this GPS track"
 msgstr "將影片與這個 GPS 軌跡同步"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "Remove Video"
 msgstr "移除影片"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
 msgid "removes current video from layer"
 msgstr "將目前的影片從圖層中移除"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "play/pause"
 msgstr "播放/暫停"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
 msgid "starts/pauses video playback"
 msgstr "開始/暫停影片的播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "backward"
 msgstr "倒轉"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jump"
-msgstr "上"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:169
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:171
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
 msgid "please enter GPS timecode"
-msgstr "請輸入拼貼索引"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "forward"
 msgstr "快轉"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:187
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster"
 msgstr "加速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:195
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
 msgid "faster playback"
 msgstr "加速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower"
 msgstr "減速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
 msgid "slower playback"
 msgstr "減速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
 msgid "loop"
 msgstr "循環"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:211
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
 msgid "loops n sec around current position"
 msgstr "在目前的地點循環播放 n 秒"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "Keep centered"
 msgstr "保持置中"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:221
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
 msgid "follows the video icon automaticly"
 msgstr "自動跟隨影片圖示"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Subtitles"
-msgstr "柵欄台階"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:231
-#, fuzzy
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
 msgid "Show subtitles in video"
-msgstr "顯示目前在影片中的位置"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:239
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
 msgid "Set the length of a jump"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Jump in video for x ms"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:254
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "循環長度"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:250
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Set the length around a looppoint"
 msgstr "設定循環點的長度"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:263
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
 msgid "no deinterlacing"
 msgstr "沒有非交錯式"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:271
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:279
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20201,7 +20344,6 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
-#, fuzzy
 msgid "mute"
-msgstr "多個"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20300,12 +20442,10 @@
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
-#, fuzzy
 msgid "Select waypoint to move map"
-msgstr "選取指定的搜尋"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
-#, fuzzy
 msgid "Waypoint search"
-msgstr "路標"
+msgstr ""
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -20322,9 +20462,9 @@
 msgstr "選擇路徑的非分支次序"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
 msgid "Exception occurred"
 msgstr "發生例外"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:90
 msgid "Not in cache"
 msgstr "不在快取中"
@@ -20383,21 +20523,21 @@
 msgstr "調整選取的 WMS 圖層的位置"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:170
 msgid "Please select the WMS layer to adjust."
 msgstr "請選擇要調整的 WMS 圖層。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr "選擇 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
 msgstr "開始調整"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:195
 msgid "There are currently no WMS layer to adjust."
 msgstr "目前沒有 WMS 圖層要調整。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:196
 msgid "No layers to adjust"
 msgstr "沒有要調整的圖層"
@@ -20408,5 +20548,5 @@
 msgstr "從 {0} 下載 WMS 拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:105
 #, java-format
 msgid ""
@@ -20415,5 +20555,5 @@
 msgstr "警告：WMS 服務的基礎 URL「{0}」缺少「&」或「?」。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:106
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -20421,10 +20561,10 @@
 msgstr "警告：取回 WMS 拼貼似乎失敗了。請檢查您的偏好設定值。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:107
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "警告：完整的 URL 是「{0}」。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:128
 #, java-format
 msgid ""
@@ -20435,24 +20575,24 @@
 "這可能會導致錯誤的坐標。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告：不使用 WMS 圖層，因為基礎 url「{0}」格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136
 msgid "(deactivated)"
 msgstr "(不使用)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
 #, java-format
 msgid ""
@@ -20466,75 +20606,100 @@
 "WMS 拼貼？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Yes, fetch images"
 msgstr "是，抓取圖片"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Invalid URL?"
 msgstr "無效的 URL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:314
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
 msgid "Save WMS layer to file"
 msgstr "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:440
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
 msgid "Error loading file"
 msgstr "載入檔案有錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:474
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
 msgid "Set WMS Bookmark"
 msgstr "設定 WMS 書籤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:500
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
 msgid "Automatic downloading"
 msgstr "自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#, fuzzy
+msgid "Could not initialize remote control."
+msgstr "找不到地圖物件。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#, java-format
+msgid "Remote control plugin is not compatible with {0}."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#, java-format
+msgid ""
+"{0} will work but remote control is disabled.\n"
+"Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
+"internal version {5}.\n"
+"You should update the plugins. If this does not help report a bug for \"{0}"
+"\"."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192
+#, java-format
+msgid "{0}: Problem with remote control"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:258
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "開啓空白 WMS 圖層以便自檔案載入資料"
@@ -20603,8 +20768,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
-#, fuzzy
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
-msgstr "遠端控制被要求自下列 URL 匯入資料："
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21109,16 +21273,21 @@
 "題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
 
+#. Plugin OpeningHoursEditor
+#: build/trans_plugins.java:50
+msgid "extended options for editing opening_hours"
+msgstr ""
+
 #. Plugin openlayers
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:52
 msgid "Displays an OpenLayers background image"
 msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:54
 msgid "Imports issues from OpenStreetBugs"
 msgstr "匯入OpenStreetBugs 的議題"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:56
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21126,5 +21295,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21132,5 +21301,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21140,5 +21309,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21147,10 +21316,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21158,15 +21327,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:68
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:70
 msgid "Plugin for reverting changesets"
 msgstr "還原變更組合的外掛程式"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:72
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21178,5 +21347,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:74
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21187,10 +21356,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:76
 msgid "Provides routing capabilities."
 msgstr "提供路線規畫的功能。"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:78
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21201,5 +21370,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:80
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21209,15 +21378,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:82
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:84
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:86
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21229,15 +21398,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:88
 msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
 
 #. Plugin toms
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21246,5 +21415,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21253,5 +21422,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21262,10 +21431,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid "Allows undeleting object from OSM database"
 msgstr "允許從 OSM 資料庫中取消物件的刪除"
 
 #. Plugin validator
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21276,5 +21445,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21286,5 +21455,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21295,20 +21464,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid "Select a sequence of non-branching connected ways"
 msgstr "選擇非分支連接的路徑次序"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:112
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21317,5 +21486,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:114
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21357,4 +21526,5 @@
 #. default: default string to display
 #. delete_if_empty: true/false
+#. use_last_as_default: true/false
 #. check: checkbox
 #. key: key to set
@@ -21387,10 +21557,10 @@
 #. -->
 #. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Highways"
 msgstr "公路"
 
 #. group "Highways"
-#: build/trans_presets.java:78
+#: build/trans_presets.java:79
 msgid "Streets"
 msgstr "街道"
@@ -21401,5 +21571,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:79 build/trans_surveyor.java:72
+#: build/trans_presets.java:80 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速公路(Motorway)"
@@ -21408,5 +21578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:82
+#: build/trans_presets.java:83
 msgid "Edit Motorway"
 msgstr "編輯高速公路"
@@ -21443,10 +21613,10 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:85 build/trans_presets.java:121
-#: build/trans_presets.java:141 build/trans_presets.java:161
-#: build/trans_presets.java:198 build/trans_presets.java:218
-#: build/trans_presets.java:1534 build/trans_presets.java:1542
-#: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2615 build/trans_presets.java:3448
+#: build/trans_presets.java:86 build/trans_presets.java:122
+#: build/trans_presets.java:142 build/trans_presets.java:162
+#: build/trans_presets.java:199 build/trans_presets.java:219
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1665
+#: build/trans_presets.java:2709 build/trans_presets.java:3583
 msgid "Reference"
 msgstr "道路編號"
@@ -21460,8 +21630,8 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:89 build/trans_presets.java:106
-#: build/trans_presets.java:125 build/trans_presets.java:144
-#: build/trans_presets.java:165 build/trans_presets.java:181
-#: build/trans_presets.java:202 build/trans_presets.java:420
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:421
 msgid "Lanes"
 msgstr "車道數"
@@ -21480,13 +21650,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Ways/Dedicated Bridleway" combo "Layer"
-#: build/trans_presets.java:90 build/trans_presets.java:107
-#: build/trans_presets.java:126 build/trans_presets.java:145
-#: build/trans_presets.java:166 build/trans_presets.java:182
-#: build/trans_presets.java:203 build/trans_presets.java:222
-#: build/trans_presets.java:246 build/trans_presets.java:321
-#: build/trans_presets.java:353 build/trans_presets.java:373
-#: build/trans_presets.java:395 build/trans_presets.java:435
-#: build/trans_presets.java:450 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:1255
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:247 build/trans_presets.java:322
+#: build/trans_presets.java:354 build/trans_presets.java:374
+#: build/trans_presets.java:396 build/trans_presets.java:436
+#: build/trans_presets.java:451 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:1269
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -21520,17 +21690,17 @@
 #. item "Ways/Path" check "Embankment"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:91 build/trans_presets.java:108
-#: build/trans_presets.java:127 build/trans_presets.java:146
-#: build/trans_presets.java:167 build/trans_presets.java:183
-#: build/trans_presets.java:204 build/trans_presets.java:223
-#: build/trans_presets.java:239 build/trans_presets.java:258
-#: build/trans_presets.java:276 build/trans_presets.java:294
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:346 build/trans_presets.java:365
-#: build/trans_presets.java:382 build/trans_presets.java:414
-#: build/trans_presets.java:471 build/trans_presets.java:495
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:560 build/trans_presets.java:582
-#: build/trans_presets.java:620 build/trans_presets.java:1248
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:347 build/trans_presets.java:366
+#: build/trans_presets.java:383 build/trans_presets.java:415
+#: build/trans_presets.java:472 build/trans_presets.java:496
+#: build/trans_presets.java:518 build/trans_presets.java:538
+#: build/trans_presets.java:561 build/trans_presets.java:583
+#: build/trans_presets.java:621 build/trans_presets.java:1262
 msgid "Oneway"
 msgstr "單行道"
@@ -21567,17 +21737,17 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:92 build/trans_presets.java:109
-#: build/trans_presets.java:129 build/trans_presets.java:148
-#: build/trans_presets.java:169 build/trans_presets.java:185
-#: build/trans_presets.java:205 build/trans_presets.java:224
-#: build/trans_presets.java:240 build/trans_presets.java:259
-#: build/trans_presets.java:277 build/trans_presets.java:295
-#: build/trans_presets.java:314 build/trans_presets.java:347
-#: build/trans_presets.java:366 build/trans_presets.java:415
-#: build/trans_presets.java:424 build/trans_presets.java:467
-#: build/trans_presets.java:491 build/trans_presets.java:518
-#: build/trans_presets.java:538 build/trans_presets.java:561
-#: build/trans_presets.java:583 build/trans_presets.java:601
-#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:425 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1263
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21611,17 +21781,17 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:93 build/trans_presets.java:110
-#: build/trans_presets.java:130 build/trans_presets.java:149
-#: build/trans_presets.java:170 build/trans_presets.java:186
-#: build/trans_presets.java:206 build/trans_presets.java:225
-#: build/trans_presets.java:241 build/trans_presets.java:260
-#: build/trans_presets.java:278 build/trans_presets.java:296
-#: build/trans_presets.java:315 build/trans_presets.java:348
-#: build/trans_presets.java:367 build/trans_presets.java:416
-#: build/trans_presets.java:440 build/trans_presets.java:468
-#: build/trans_presets.java:492 build/trans_presets.java:519
-#: build/trans_presets.java:539 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1250
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:441 build/trans_presets.java:469
+#: build/trans_presets.java:493 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:563
+#: build/trans_presets.java:585 build/trans_presets.java:603
+#: build/trans_presets.java:623 build/trans_presets.java:1264
 msgid "Tunnel"
 msgstr "隧道"
@@ -21652,17 +21822,17 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:94 build/trans_presets.java:111
-#: build/trans_presets.java:131 build/trans_presets.java:150
-#: build/trans_presets.java:171 build/trans_presets.java:187
-#: build/trans_presets.java:207 build/trans_presets.java:226
-#: build/trans_presets.java:242 build/trans_presets.java:261
-#: build/trans_presets.java:279 build/trans_presets.java:297
-#: build/trans_presets.java:316 build/trans_presets.java:349
-#: build/trans_presets.java:368 build/trans_presets.java:417
-#: build/trans_presets.java:469 build/trans_presets.java:493
-#: build/trans_presets.java:520 build/trans_presets.java:540
-#: build/trans_presets.java:563 build/trans_presets.java:585
-#: build/trans_presets.java:603 build/trans_presets.java:623
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1265
 msgid "Cutting"
 msgstr "斷開"
@@ -21693,17 +21863,17 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:95 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:151
-#: build/trans_presets.java:172 build/trans_presets.java:188
-#: build/trans_presets.java:208 build/trans_presets.java:227
-#: build/trans_presets.java:243 build/trans_presets.java:262
-#: build/trans_presets.java:280 build/trans_presets.java:298
-#: build/trans_presets.java:317 build/trans_presets.java:350
-#: build/trans_presets.java:369 build/trans_presets.java:418
-#: build/trans_presets.java:470 build/trans_presets.java:494
-#: build/trans_presets.java:521 build/trans_presets.java:541
-#: build/trans_presets.java:564 build/trans_presets.java:586
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:96 build/trans_presets.java:113
+#: build/trans_presets.java:133 build/trans_presets.java:152
+#: build/trans_presets.java:173 build/trans_presets.java:189
+#: build/trans_presets.java:209 build/trans_presets.java:228
+#: build/trans_presets.java:244 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:318 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:565 build/trans_presets.java:587
+#: build/trans_presets.java:605 build/trans_presets.java:625
+#: build/trans_presets.java:1266
 msgid "Embankment"
 msgstr "堤防"
@@ -21711,5 +21881,5 @@
 #. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:98
+#: build/trans_presets.java:99
 msgid "Motorway Link"
 msgstr "高速公路連絡道路"
@@ -21718,5 +21888,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:101
+#: build/trans_presets.java:102
 msgid "Edit Motorway Link"
 msgstr "編輯高速公路連絡道路"
@@ -21724,5 +21894,5 @@
 #. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:116
 msgid "Trunk"
 msgstr "快速道路(Trunk)"
@@ -21731,5 +21901,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:118
+#: build/trans_presets.java:119
 msgid "Edit Trunk"
 msgstr "編輯快速道路"
@@ -21739,6 +21909,6 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:128 build/trans_presets.java:147
-#: build/trans_presets.java:168 build/trans_presets.java:184
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
 msgid "Motorroad"
 msgstr "汽車專用"
@@ -21746,5 +21916,5 @@
 #. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:135
+#: build/trans_presets.java:136
 msgid "Trunk Link"
 msgstr "快速道路連絡道路"
@@ -21753,5 +21923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:138
+#: build/trans_presets.java:139
 msgid "Edit Trunk Link"
 msgstr "編輯快速道路連絡道路"
@@ -21764,5 +21934,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:155 build/trans_surveyor.java:76
+#: build/trans_presets.java:156 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "省道(Primary)"
@@ -21771,5 +21941,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:158
+#: build/trans_presets.java:159
 msgid "Edit Primary Road"
 msgstr "編輯省道"
@@ -21777,10 +21947,10 @@
 #. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:175
+#: build/trans_presets.java:176
 msgid "Primary Link"
 msgstr "省道連絡道路"
 
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:176
+#: build/trans_presets.java:177
 msgid "Edit Primary Link"
 msgstr "編輯省道連絡道路"
@@ -21792,5 +21962,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:191 build/trans_surveyor.java:80
+#: build/trans_presets.java:192 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "縣道(Secondary)"
@@ -21800,5 +21970,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:196
 msgid "Edit Secondary Road"
 msgstr "編輯縣道"
@@ -21806,5 +21976,5 @@
 #. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Tertiary"
 msgstr "鄉道(Tertiary)"
@@ -21814,5 +21984,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:215
+#: build/trans_presets.java:216
 msgid "Edit Tertiary Road"
 msgstr "編輯鄉道"
@@ -21824,5 +21994,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:230 build/trans_surveyor.java:84
+#: build/trans_presets.java:231 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "未分類(Unclassified)"
@@ -21832,5 +22002,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:234
+#: build/trans_presets.java:235
 msgid "Edit Unclassified Road"
 msgstr "編輯未分類的道路"
@@ -21840,6 +22010,6 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:244 build/trans_presets.java:318
-#: build/trans_presets.java:587 build/trans_presets.java:605
+#: build/trans_presets.java:245 build/trans_presets.java:319
+#: build/trans_presets.java:588 build/trans_presets.java:606
 msgid "Passing Places"
 msgstr ""
@@ -21862,15 +22032,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:354
-#: build/trans_presets.java:374 build/trans_presets.java:421
-#: build/trans_presets.java:437 build/trans_presets.java:451
-#: build/trans_presets.java:476 build/trans_presets.java:505
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566 build/trans_presets.java:589
-#: build/trans_presets.java:607 build/trans_presets.java:626
-#: build/trans_presets.java:1256 build/trans_presets.java:1460
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:248 build/trans_presets.java:266
+#: build/trans_presets.java:284 build/trans_presets.java:302
+#: build/trans_presets.java:323 build/trans_presets.java:355
+#: build/trans_presets.java:375 build/trans_presets.java:422
+#: build/trans_presets.java:438 build/trans_presets.java:452
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:545
+#: build/trans_presets.java:567 build/trans_presets.java:590
+#: build/trans_presets.java:608 build/trans_presets.java:627
+#: build/trans_presets.java:1270 build/trans_presets.java:1541
+#: build/trans_presets.java:1586
 msgid "Width (meters)"
 msgstr "寬度 (米)"
@@ -21882,5 +22052,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:250 build/trans_surveyor.java:88
+#: build/trans_presets.java:251 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住的(Residential)"
@@ -21889,5 +22059,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:253
+#: build/trans_presets.java:254
 msgid "Edit Residential Street"
 msgstr "編輯居住的街道"
@@ -21907,12 +22077,12 @@
 #. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "Surface"
 msgstr "路面"
@@ -21934,166 +22104,166 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "paved"
 msgstr "有鋪面的"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "unpaved"
 msgstr "沒鋪面的"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "asphalt"
 msgstr "柏油"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "concrete"
 msgstr "水泥地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "metal"
 msgstr "金屬"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2697
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268 build/trans_presets.java:2791
 msgid "wood"
 msgstr "木頭"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "paving_stones"
 msgstr "鋪路石"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "cobblestone"
 msgstr "石子路"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "gravel"
 msgstr "碎石路"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "pebblestone"
 msgstr "鵝卵石"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "compacted"
 msgstr "壓實的"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:488
-#: build/trans_presets.java:516 build/trans_presets.java:536
-#: build/trans_presets.java:559 build/trans_presets.java:581
-#: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:489
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:601 build/trans_presets.java:620
+#: build/trans_presets.java:1268
 msgid "grass_paver"
 msgstr "草地_鋪面"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "sand"
 msgstr "沙地"
 
-#: build/trans_presets.java:264 build/trans_presets.java:282
-#: build/trans_presets.java:300 build/trans_presets.java:320
-#: build/trans_presets.java:335 build/trans_presets.java:352
-#: build/trans_presets.java:371 build/trans_presets.java:465
-#: build/trans_presets.java:488 build/trans_presets.java:516
-#: build/trans_presets.java:536 build/trans_presets.java:559
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:619 build/trans_presets.java:1254
+#: build/trans_presets.java:265 build/trans_presets.java:283
+#: build/trans_presets.java:301 build/trans_presets.java:321
+#: build/trans_presets.java:336 build/trans_presets.java:353
+#: build/trans_presets.java:372 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:517
+#: build/trans_presets.java:537 build/trans_presets.java:560
+#: build/trans_presets.java:582 build/trans_presets.java:601
+#: build/trans_presets.java:620 build/trans_presets.java:1268
 msgid "ground"
 msgstr "地面"
@@ -22101,5 +22271,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:268
+#: build/trans_presets.java:269
 msgid "Living Street"
 msgstr "生活街道"
@@ -22108,5 +22278,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:271
+#: build/trans_presets.java:272
 msgid "Edit Living Street"
 msgstr "編輯生活街道"
@@ -22114,5 +22284,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:286
+#: build/trans_presets.java:287
 msgid "Pedestrian"
 msgstr "徒步區"
@@ -22121,5 +22291,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:289
+#: build/trans_presets.java:290
 msgid "Edit Pedestrian Street"
 msgstr "編輯徒步區街道"
@@ -22127,5 +22297,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:304
+#: build/trans_presets.java:305
 msgid "Service"
 msgstr "服務型(Service)"
@@ -22134,5 +22304,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:307
+#: build/trans_presets.java:308
 msgid "Edit Serviceway"
 msgstr "編輯服務型道路"
@@ -22142,18 +22312,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "Serviceway type"
 msgstr "服務型道路類型"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "alley"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "driveway"
 msgstr "車道"
 
-#: build/trans_presets.java:311
+#: build/trans_presets.java:312
 msgid "parking_aisle"
 msgstr "停車場通道"
@@ -22161,5 +22331,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Parking Aisle"
 msgstr "停車場通道"
@@ -22169,10 +22339,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:329
+#: build/trans_presets.java:330
 msgid "Edit Parking Aisle"
 msgstr "編輯停車場通道"
 
 #. </optional>
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Road (Unknown Type)"
 msgstr "道路（不明的類型）"
@@ -22181,5 +22351,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:341
+#: build/trans_presets.java:342
 msgid "Edit Road of unknown type"
 msgstr "編輯不明類型的道路"
@@ -22187,14 +22357,14 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:357
+#: build/trans_presets.java:358
 msgid "Construction"
 msgstr "施工"
 
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:358
+#: build/trans_presets.java:359
 msgid "Edit Highway Under Construction"
 msgstr "編輯施工中的公路"
 
-#: build/trans_presets.java:372
+#: build/trans_presets.java:373
 msgid "Junction"
 msgstr "交叉點"
@@ -22210,5 +22380,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:372 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:923
 msgid "roundabout"
 msgstr "圓環"
@@ -22217,5 +22387,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Road Restrictions"
 msgstr "道路限制"
@@ -22224,15 +22394,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:381
+#: build/trans_presets.java:382
 msgid "Edit Road Restrictions"
 msgstr "編輯道路限制"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:383
+#: build/trans_presets.java:384
 msgid "Toll"
 msgstr "通行費"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:384
+#: build/trans_presets.java:385
 msgid "No exit (cul-de-sac)"
 msgstr "沒有出口（死路）"
@@ -22240,5 +22410,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:385 build/trans_presets.java:473
+#: build/trans_presets.java:386 build/trans_presets.java:474
 msgid "Access"
 msgstr ""
@@ -22264,4 +22434,5 @@
 #. item "Ways/Path" combo "Motorcar"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Fuel" combo "With shop"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -22269,4 +22440,10 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Motorcycle/Parking" combo "Fee"
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
+#. item "Motorcycle/Motorcycle Dealer" combo "Rental"
+#. item "Motorcycle/Motorcycle Dealer" combo "Repair"
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
+#. item "Motorcycle/Motorcycle Dealer" combo "Clothes"
 #. item "Public Transport/Bus Stop" combo "Shelter"
 #. item "Public Transport/Bus Stop" combo "Bench"
@@ -22342,236 +22519,243 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+#: build/trans_presets.java:543 build/trans_presets.java:700
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1359
+#: build/trans_presets.java:1385 build/trans_presets.java:1386
+#: build/trans_presets.java:1389 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1469
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#: build/trans_presets.java:1472 build/trans_presets.java:1575
+#: build/trans_presets.java:1576 build/trans_presets.java:1577
+#: build/trans_presets.java:1680 build/trans_presets.java:1681
+#: build/trans_presets.java:1682 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1699
+#: build/trans_presets.java:1700 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1715
+#: build/trans_presets.java:1716 build/trans_presets.java:1717
+#: build/trans_presets.java:1731 build/trans_presets.java:1732
+#: build/trans_presets.java:1733 build/trans_presets.java:1734
+#: build/trans_presets.java:1749 build/trans_presets.java:1750
+#: build/trans_presets.java:1751 build/trans_presets.java:1752
+#: build/trans_presets.java:1766 build/trans_presets.java:1767
+#: build/trans_presets.java:1768 build/trans_presets.java:1769
+#: build/trans_presets.java:1783 build/trans_presets.java:1784
+#: build/trans_presets.java:1785 build/trans_presets.java:1786
+#: build/trans_presets.java:1800 build/trans_presets.java:1801
+#: build/trans_presets.java:1802 build/trans_presets.java:1803
+#: build/trans_presets.java:1823 build/trans_presets.java:1824
+#: build/trans_presets.java:1825 build/trans_presets.java:1826
+#: build/trans_presets.java:1842 build/trans_presets.java:1843
+#: build/trans_presets.java:1844 build/trans_presets.java:1845
+#: build/trans_presets.java:1859 build/trans_presets.java:1860
+#: build/trans_presets.java:1861 build/trans_presets.java:1862
+#: build/trans_presets.java:1878 build/trans_presets.java:1879
+#: build/trans_presets.java:1880 build/trans_presets.java:1881
+#: build/trans_presets.java:1897 build/trans_presets.java:1898
+#: build/trans_presets.java:1899 build/trans_presets.java:1900
+#: build/trans_presets.java:1913 build/trans_presets.java:1914
+#: build/trans_presets.java:1915 build/trans_presets.java:1916
+#: build/trans_presets.java:1930 build/trans_presets.java:1931
+#: build/trans_presets.java:1932 build/trans_presets.java:1933
+#: build/trans_presets.java:1947 build/trans_presets.java:1948
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748 build/trans_presets.java:2749
+#: build/trans_presets.java:2790 build/trans_presets.java:2799
+#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:3087
+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:386 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: build/trans_style.java:212
+msgid "private"
+msgstr "私人的"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+#: 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:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_style.java:205
+msgid "permissive"
+msgstr "隨意的"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "agricultural"
+msgstr "農業的"
+
+#: build/trans_presets.java:386 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
+msgid "forestry"
+msgstr "林業"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:395
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:476 build/trans_presets.java:491
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:503 build/trans_presets.java:543
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_presets.java:1292
+#: build/trans_presets.java:1359 build/trans_presets.java:1385
+#: build/trans_presets.java:1386 build/trans_presets.java:1389
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1469 build/trans_presets.java:1470
+#: build/trans_presets.java:1471 build/trans_presets.java:1472
+#: build/trans_presets.java:1575 build/trans_presets.java:1576
+#: build/trans_presets.java:1577 build/trans_presets.java:1680
+#: build/trans_presets.java:1681 build/trans_presets.java:1682
+#: build/trans_presets.java:1683 build/trans_presets.java:1698
+#: build/trans_presets.java:1699 build/trans_presets.java:1700
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1715 build/trans_presets.java:1716
+#: build/trans_presets.java:1717 build/trans_presets.java:1731
+#: build/trans_presets.java:1732 build/trans_presets.java:1733
+#: build/trans_presets.java:1734 build/trans_presets.java:1749
+#: build/trans_presets.java:1750 build/trans_presets.java:1751
+#: build/trans_presets.java:1752 build/trans_presets.java:1766
+#: build/trans_presets.java:1767 build/trans_presets.java:1768
+#: build/trans_presets.java:1769 build/trans_presets.java:1783
+#: build/trans_presets.java:1784 build/trans_presets.java:1785
+#: build/trans_presets.java:1786 build/trans_presets.java:1800
+#: build/trans_presets.java:1801 build/trans_presets.java:1802
+#: build/trans_presets.java:1803 build/trans_presets.java:1823
+#: build/trans_presets.java:1824 build/trans_presets.java:1825
+#: build/trans_presets.java:1826 build/trans_presets.java:1842
+#: build/trans_presets.java:1843 build/trans_presets.java:1844
+#: build/trans_presets.java:1845 build/trans_presets.java:1859
+#: build/trans_presets.java:1860 build/trans_presets.java:1861
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1879 build/trans_presets.java:1880
+#: build/trans_presets.java:1881 build/trans_presets.java:1897
+#: build/trans_presets.java:1898 build/trans_presets.java:1899
+#: build/trans_presets.java:1900 build/trans_presets.java:1913
+#: build/trans_presets.java:1914 build/trans_presets.java:1915
+#: build/trans_presets.java:1916 build/trans_presets.java:1930
+#: build/trans_presets.java:1931 build/trans_presets.java:1932
+#: build/trans_presets.java:1933 build/trans_presets.java:1947
+#: build/trans_presets.java:1948 build/trans_presets.java:2070
+#: build/trans_presets.java:2080 build/trans_presets.java:2748
+#: build/trans_presets.java:2749 build/trans_presets.java:2790
+#: build/trans_presets.java:2799 build/trans_presets.java:2800
+#: build/trans_presets.java:2801 build/trans_presets.java:3087
+msgid "no"
+msgstr "否"
+
+#: build/trans_presets.java:387
+msgid "Agricultural"
+msgstr "農業的"
+
 #: build/trans_presets.java:387 build/trans_presets.java:388
 #: build/trans_presets.java:389 build/trans_presets.java:390
 #: build/trans_presets.java:391 build/trans_presets.java:392
 #: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:395 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:476
 #: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:499 build/trans_presets.java:500
-#: build/trans_presets.java:501 build/trans_presets.java:502
-#: build/trans_presets.java:542 build/trans_presets.java:678
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1369
-#: build/trans_presets.java:1370 build/trans_presets.java:1373
-#: build/trans_presets.java:1374 build/trans_presets.java:1375
-#: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1599
-#: build/trans_presets.java:1600 build/trans_presets.java:1601
-#: build/trans_presets.java:1602 build/trans_presets.java:1617
-#: build/trans_presets.java:1618 build/trans_presets.java:1619
-#: build/trans_presets.java:1620 build/trans_presets.java:1633
-#: build/trans_presets.java:1634 build/trans_presets.java:1635
-#: build/trans_presets.java:1636 build/trans_presets.java:1650
-#: build/trans_presets.java:1651 build/trans_presets.java:1652
-#: build/trans_presets.java:1653 build/trans_presets.java:1668
-#: build/trans_presets.java:1669 build/trans_presets.java:1670
-#: build/trans_presets.java:1671 build/trans_presets.java:1685
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1701
-#: build/trans_presets.java:1702 build/trans_presets.java:1703
-#: build/trans_presets.java:1704 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1741
-#: build/trans_presets.java:1742 build/trans_presets.java:1743
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1761 build/trans_presets.java:1762
-#: build/trans_presets.java:1763 build/trans_presets.java:1777
-#: build/trans_presets.java:1778 build/trans_presets.java:1779
-#: build/trans_presets.java:1780 build/trans_presets.java:1795
-#: build/trans_presets.java:1796 build/trans_presets.java:1797
-#: build/trans_presets.java:1798 build/trans_presets.java:1814
-#: build/trans_presets.java:1815 build/trans_presets.java:1816
-#: build/trans_presets.java:1817 build/trans_presets.java:1830
-#: build/trans_presets.java:1831 build/trans_presets.java:1832
-#: build/trans_presets.java:1833 build/trans_presets.java:1847
-#: build/trans_presets.java:1848 build/trans_presets.java:1849
-#: build/trans_presets.java:1850 build/trans_presets.java:1864
-#: build/trans_presets.java:1865 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
-#: build/trans_presets.java:2655 build/trans_presets.java:2696
-#: build/trans_presets.java:2705 build/trans_presets.java:2706
-#: build/trans_presets.java:2707 build/trans_presets.java:2997
-msgid "yes"
-msgstr "是"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:499 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:503
+msgid "designated"
+msgstr "已指定"
+
 #: build/trans_presets.java:388 build/trans_presets.java:389
 #: build/trans_presets.java:390 build/trans_presets.java:391
 #: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:394 build/trans_presets.java:395
 #: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:212
-msgid "private"
-msgstr "私人的"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "目的地"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_style.java:205
-msgid "permissive"
-msgstr "隨意的"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "agricultural"
-msgstr "農業的"
-
-#: build/trans_presets.java:385 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-msgid "forestry"
-msgstr "林業"
-
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475
-msgid "delivery"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:385 build/trans_presets.java:386
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:490
-#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:476 build/trans_presets.java:497
 #: build/trans_presets.java:498 build/trans_presets.java:499
-#: build/trans_presets.java:500 build/trans_presets.java:501
-#: build/trans_presets.java:502 build/trans_presets.java:542
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_presets.java:1278
-#: build/trans_presets.java:1369 build/trans_presets.java:1370
-#: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:1494
-#: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1599 build/trans_presets.java:1600
-#: build/trans_presets.java:1601 build/trans_presets.java:1602
-#: build/trans_presets.java:1617 build/trans_presets.java:1618
-#: build/trans_presets.java:1619 build/trans_presets.java:1620
-#: build/trans_presets.java:1633 build/trans_presets.java:1634
-#: build/trans_presets.java:1635 build/trans_presets.java:1636
-#: build/trans_presets.java:1650 build/trans_presets.java:1651
-#: build/trans_presets.java:1652 build/trans_presets.java:1653
-#: build/trans_presets.java:1668 build/trans_presets.java:1669
-#: build/trans_presets.java:1670 build/trans_presets.java:1671
-#: build/trans_presets.java:1685 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1701 build/trans_presets.java:1702
-#: build/trans_presets.java:1703 build/trans_presets.java:1704
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1741 build/trans_presets.java:1742
-#: build/trans_presets.java:1743 build/trans_presets.java:1744
-#: build/trans_presets.java:1760 build/trans_presets.java:1761
-#: build/trans_presets.java:1762 build/trans_presets.java:1763
-#: build/trans_presets.java:1777 build/trans_presets.java:1778
-#: build/trans_presets.java:1779 build/trans_presets.java:1780
-#: build/trans_presets.java:1795 build/trans_presets.java:1796
-#: build/trans_presets.java:1797 build/trans_presets.java:1798
-#: build/trans_presets.java:1814 build/trans_presets.java:1815
-#: build/trans_presets.java:1816 build/trans_presets.java:1817
-#: build/trans_presets.java:1830 build/trans_presets.java:1831
-#: build/trans_presets.java:1832 build/trans_presets.java:1833
-#: build/trans_presets.java:1847 build/trans_presets.java:1848
-#: build/trans_presets.java:1849 build/trans_presets.java:1850
-#: build/trans_presets.java:1864 build/trans_presets.java:1865
-#: build/trans_presets.java:1974 build/trans_presets.java:1984
-#: build/trans_presets.java:2654 build/trans_presets.java:2655
-#: build/trans_presets.java:2696 build/trans_presets.java:2705
-#: build/trans_presets.java:2706 build/trans_presets.java:2707
-#: build/trans_presets.java:2997
-msgid "no"
-msgstr "否"
-
-#: build/trans_presets.java:386
-msgid "Agricultural"
-msgstr "農業的"
-
-#: build/trans_presets.java:386 build/trans_presets.java:387
-#: build/trans_presets.java:388 build/trans_presets.java:389
-#: build/trans_presets.java:390 build/trans_presets.java:391
-#: build/trans_presets.java:392 build/trans_presets.java:393
-#: build/trans_presets.java:394 build/trans_presets.java:473
-#: build/trans_presets.java:474 build/trans_presets.java:475
-#: build/trans_presets.java:496 build/trans_presets.java:497
-#: build/trans_presets.java:498 build/trans_presets.java:500
 #: build/trans_presets.java:501 build/trans_presets.java:502
-msgid "designated"
-msgstr "已指定"
-
-#: build/trans_presets.java:387 build/trans_presets.java:388
-#: build/trans_presets.java:389 build/trans_presets.java:390
-#: build/trans_presets.java:391 build/trans_presets.java:392
-#: build/trans_presets.java:393 build/trans_presets.java:394
-#: build/trans_presets.java:473 build/trans_presets.java:474
-#: build/trans_presets.java:475 build/trans_presets.java:496
-#: build/trans_presets.java:497 build/trans_presets.java:498
-#: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
 msgstr "正式的"
 
-#: build/trans_presets.java:389
+#: build/trans_presets.java:390
 msgid "Goods"
 msgstr "貨物"
 
-#: build/trans_presets.java:390
+#: build/trans_presets.java:391
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車 (hgv)"
@@ -22586,10 +22770,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:391 build/trans_presets.java:498
-#: build/trans_presets.java:755 build/trans_presets.java:788
-#: build/trans_presets.java:810 build/trans_presets.java:847
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:884 build/trans_presets.java:896
-#: build/trans_presets.java:936
+#: build/trans_presets.java:392 build/trans_presets.java:499
+#: build/trans_presets.java:768 build/trans_presets.java:801
+#: build/trans_presets.java:823 build/trans_presets.java:860
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:909
+#: build/trans_presets.java:949
 msgid "Horse"
 msgstr "馬"
@@ -22605,10 +22789,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:392 build/trans_presets.java:474
-#: build/trans_presets.java:756 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:811
-#: build/trans_presets.java:848 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:885
-#: build/trans_presets.java:897 build/trans_presets.java:937
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:769 build/trans_presets.java:787
+#: build/trans_presets.java:802 build/trans_presets.java:824
+#: build/trans_presets.java:861 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:910 build/trans_presets.java:950
+#: build/trans_presets.java:1450
 msgid "Motorcycle"
 msgstr "機車"
@@ -22623,19 +22808,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:393 build/trans_presets.java:475
-#: build/trans_presets.java:502 build/trans_presets.java:775
-#: build/trans_presets.java:790 build/trans_presets.java:812
-#: build/trans_presets.java:849 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:886
-#: build/trans_presets.java:898 build/trans_presets.java:938
+#: build/trans_presets.java:394 build/trans_presets.java:476
+#: build/trans_presets.java:503 build/trans_presets.java:788
+#: build/trans_presets.java:803 build/trans_presets.java:825
+#: build/trans_presets.java:862 build/trans_presets.java:875
+#: build/trans_presets.java:887 build/trans_presets.java:899
+#: build/trans_presets.java:911 build/trans_presets.java:951
 msgid "Motorcar"
 msgstr "汽車"
 
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Public Service Vehicles (psv)"
 msgstr "公共汽車 (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:396
+#: build/trans_presets.java:397
 msgid "Min. speed (km/h)"
 msgstr "最低限速 (km/h)"
@@ -22643,20 +22828,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:397 build/trans_presets.java:436
+#: build/trans_presets.java:398 build/trans_presets.java:437
 msgid "Max. weight (tonnes)"
 msgstr "總重限制（噸）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:398
+#: build/trans_presets.java:399
 msgid "Max. Height (meters)"
 msgstr "高度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:399
+#: build/trans_presets.java:400
 msgid "Max. Width (meters)"
 msgstr "寬度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:400
+#: build/trans_presets.java:401
 msgid "Max. Length (meters)"
 msgstr "長度限制（米）"
@@ -22664,5 +22849,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:403
+#: build/trans_presets.java:404
 msgid "Roundabout"
 msgstr "圓環"
@@ -22673,5 +22858,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:408
+#: build/trans_presets.java:409
 msgid "Edit Junction"
 msgstr "編輯交叉點"
@@ -22691,10 +22876,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_presets.java:412 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "高速公路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "motorway_link"
 msgstr "高速公路連絡道路"
@@ -22716,10 +22901,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_presets.java:412 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "快速道路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "trunk_link"
 msgstr "快速道路連絡道路"
@@ -22741,10 +22926,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_presets.java:412 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "省道"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "primary_link"
 msgstr "省道連絡道路"
@@ -22766,5 +22951,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_presets.java:412 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22779,9 +22964,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:411 build/trans_style.java:617
+#: build/trans_presets.java:412 build/trans_style.java:617
 msgid "tertiary"
 msgstr "鄉道"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "unclassified"
 msgstr "未分類的"
@@ -22795,9 +22980,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3293
 msgid "residential"
 msgstr "居住的"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "living_street"
 msgstr "生活街道"
@@ -22841,10 +23026,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_presets.java:412 build/trans_style.java:673
 #: build/trans_style.java:4436
 msgid "service"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "bus_guideway"
 msgstr "公車專用道"
@@ -22874,5 +23059,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_presets.java:412 build/trans_style.java:905
 #: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
@@ -22884,10 +23069,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:429
+#: build/trans_presets.java:430
 msgid "Edit Bridge"
 msgstr "編輯橋樑"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:441
+#: build/trans_presets.java:442
 msgid "Edit Tunnel"
 msgstr "編輯隧道"
@@ -22895,10 +23080,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:455
+#: build/trans_presets.java:456
 msgid "Ways"
 msgstr "路徑"
 
 #. group "Ways"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Track"
 msgstr "產業道路"
@@ -22907,35 +23092,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Track"
 msgstr "編輯產業道路"
 
 #. item "Ways/Track" text "Name"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "Tracktype"
 msgstr "產業道路類型"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade1"
 msgstr "第一級"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade2"
 msgstr "第二級"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade3"
 msgstr "第三級"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade4"
 msgstr "第四級"
 
-#: build/trans_presets.java:464
+#: build/trans_presets.java:465
 msgid "grade5"
 msgstr "第五級"
 
-#: build/trans_presets.java:466 build/trans_presets.java:489
+#: build/trans_presets.java:467 build/trans_presets.java:490
 msgid "MTB Scale"
 msgstr "MTB 比例"
@@ -22943,5 +23128,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Path"
 msgstr "路徑"
@@ -22950,76 +23135,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:482
+#: build/trans_presets.java:483
 msgid "Edit Path"
 msgstr "編輯小徑"
 
 #. item "Ways/Path" text "Name"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "SAC Scale"
 msgstr "SAC 比例"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3446
+#: build/trans_presets.java:488 build/trans_presets.java:3581
 msgid "hiking"
 msgstr "健行"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "mountain_hiking"
 msgstr "登山"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_mountain_hiking"
 msgstr "費力的登山"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "alpine_hiking"
 msgstr "高山登山"
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:487
+#: build/trans_presets.java:488
 msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "excellent"
 msgstr "極好"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "good"
 msgstr "良好"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2238
+#: build/trans_presets.java:491 build/trans_presets.java:2315
 msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "bad"
 msgstr "差"
 
-#: build/trans_presets.java:490
+#: build/trans_presets.java:491
 msgid "horrible"
 msgstr "恐怖的"
 
-#: build/trans_presets.java:499 build/trans_presets.java:1602
-#: build/trans_presets.java:1620 build/trans_presets.java:1636
-#: build/trans_presets.java:1653 build/trans_presets.java:1671
-#: build/trans_presets.java:1688 build/trans_presets.java:1704
-#: build/trans_presets.java:1721 build/trans_presets.java:1744
-#: build/trans_presets.java:1763 build/trans_presets.java:1780
-#: build/trans_presets.java:1798 build/trans_presets.java:1817
-#: build/trans_presets.java:1833 build/trans_presets.java:1850
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:500 build/trans_presets.java:1683
+#: build/trans_presets.java:1701 build/trans_presets.java:1717
+#: build/trans_presets.java:1734 build/trans_presets.java:1752
+#: build/trans_presets.java:1769 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1948
 msgid "Wheelchairs"
 msgstr "輪椅"
 
-#: build/trans_presets.java:500
+#: build/trans_presets.java:501
 msgid "Ski"
 msgstr "滑雪"
 
-#: build/trans_presets.java:501
+#: build/trans_presets.java:502
 msgid "Snowmobile"
 msgstr "雪上摩托車"
@@ -23028,5 +23213,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:509
+#: build/trans_presets.java:510
 msgid "Dedicated Bridleway"
 msgstr "專用馬道"
@@ -23034,5 +23219,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:511
+#: build/trans_presets.java:512
 msgid "Edit Bridleway"
 msgstr "編輯馬道"
@@ -23040,5 +23225,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:527
+#: build/trans_presets.java:528
 msgid "Dedicated Cycleway"
 msgstr "專用自行車道"
@@ -23056,11 +23241,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:531 build/trans_presets.java:551
-#: build/trans_presets.java:573
+#: build/trans_presets.java:532 build/trans_presets.java:552
+#: build/trans_presets.java:574
 msgid "Edit Cycleway"
 msgstr "編輯自行車道"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:543
 msgid "Pedestrians"
 msgstr "行人"
@@ -23068,5 +23253,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:547
+#: build/trans_presets.java:548
 msgid "Segregated Foot- and Cycleway"
 msgstr "分離的步行與自行車道"
@@ -23074,5 +23259,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:569
+#: build/trans_presets.java:570
 msgid "Combined Foot- and Cycleway"
 msgstr "合併的步行與自行車道"
@@ -23080,5 +23265,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "Dedicated Footway"
 msgstr "專用人行步道"
@@ -23087,5 +23272,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:595
+#: build/trans_presets.java:596
 msgid "Edit Footway"
 msgstr "編輯人行步道"
@@ -23093,5 +23278,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:610
+#: build/trans_presets.java:611
 msgid "Steps"
 msgstr "階梯"
@@ -23101,10 +23286,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:614
+#: build/trans_presets.java:615
 msgid "Edit Flight of Steps"
 msgstr "編輯階梯"
 
+#. item "Ways/Steps" text "Width (meters)"
+#: build/trans_presets.java:628
+#, fuzzy
+msgid "Amount of Steps"
+msgstr "座椅數量"
+
 #. group "Waypoints"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:633
 msgid "Motorway Junction"
 msgstr "高速公路交流道"
@@ -23112,15 +23303,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:635
 msgid "Edit Motorway Junction"
 msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:639
 msgid "Number"
 msgstr "編號"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Services"
 msgstr "休息站"
@@ -23128,5 +23319,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:643
 msgid "Edit Service Station"
 msgstr "編輯休息站"
@@ -23134,10 +23325,11 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
-#. item "Car/Wash" text "Name"
-#. item "Car/Repair" text "Name"
-#. item "Car/Rental" text "Name"
-#. item "Car/Sharing" text "Name"
+#. item "Car/Fuel" text "Name"
+#. item "Car/Wash" text "Brand"
+#. item "Car/Car Dealer" text "Name"
+#. item "Car/Repair" text "Brand"
+#. item "Car/Tyres" text "Brand"
+#. item "Car/Rental" text "Brand"
+#. item "Car/Sharing" text "Brand"
 #. item "Travel/Accomodation/Hotel" text "Name"
 #. item "Travel/Accomodation/Motel" text "Name"
@@ -23166,36 +23358,57 @@
 #. item "Amenities/Telephone" label "Edit Telephone"
 #. <key key="amenity" value="telephone" />
-#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
-#. <key key="amenity" value="baby_hatch" />
-#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
+#. item "Health/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:646 build/trans_presets.java:799
-#: build/trans_presets.java:1339 build/trans_presets.java:1382
-#: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1596
-#: build/trans_presets.java:1614 build/trans_presets.java:1665
-#: build/trans_presets.java:1682 build/trans_presets.java:1735
-#: build/trans_presets.java:1756 build/trans_presets.java:1792
-#: build/trans_presets.java:1810 build/trans_presets.java:1972
-#: build/trans_presets.java:1982 build/trans_presets.java:2429
-#: build/trans_presets.java:2531 build/trans_presets.java:2561
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2639 build/trans_presets.java:2652
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2733 build/trans_presets.java:2743
-#: build/trans_presets.java:2944 build/trans_presets.java:2961
-#: build/trans_presets.java:2976 build/trans_presets.java:3015
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:648 build/trans_presets.java:812
+#: build/trans_presets.java:1357 build/trans_presets.java:1399
+#: build/trans_presets.java:1407 build/trans_presets.java:1414
+#: build/trans_presets.java:1422 build/trans_presets.java:1437
+#: build/trans_presets.java:1446 build/trans_presets.java:1465
+#: build/trans_presets.java:1677 build/trans_presets.java:1695
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1817 build/trans_presets.java:1838
+#: build/trans_presets.java:1874 build/trans_presets.java:1893
+#: build/trans_presets.java:2068 build/trans_presets.java:2078
+#: build/trans_presets.java:2545 build/trans_presets.java:2625
+#: build/trans_presets.java:2655 build/trans_presets.java:2708
+#: build/trans_presets.java:2716 build/trans_presets.java:2733
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2762 build/trans_presets.java:3034
+#: build/trans_presets.java:3051 build/trans_presets.java:3066
+#: build/trans_presets.java:3101 build/trans_presets.java:3112
+#: build/trans_presets.java:3588
 msgid "Operator"
 msgstr "經營者"
 
 #. item "Waypoints/Services" text "Operator"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
 #. </optional>
+#: build/trans_presets.java:652
+#, fuzzy
+msgid "Rest Area"
+msgstr "還原"
+
+#. item "Waypoints/Rest Area"
+#: build/trans_presets.java:653
+#, fuzzy
+msgid "Edit Rest Area"
+msgstr "編輯餐廳"
+
+#. item "Waypoints/Rest Area" text "Name"
+#. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Emergency Phone"
+msgstr "緊急電話"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
 #. <separator/>
-#: build/trans_presets.java:650
+#: build/trans_presets.java:665
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -23205,5 +23418,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:654
+#: build/trans_presets.java:669
 msgid "Pedestrian crossing type"
 msgstr "行人穿越道類型"
@@ -23212,27 +23425,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "uncontrolled"
 msgstr "沒有號誌"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "traffic_signals"
 msgstr "交通號誌"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "island"
 msgstr "安全島"
 
-#: build/trans_presets.java:654 build/trans_presets.java:669
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:669 build/trans_presets.java:691
+#: build/trans_presets.java:1292
 msgid "unmarked"
 msgstr "未畫標記"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:671
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:670 build/trans_presets.java:693
+#: build/trans_presets.java:1293
 msgid "Cross on horseback"
 msgstr ""
@@ -23240,6 +23453,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:656 build/trans_presets.java:670
-#: build/trans_presets.java:1280
+#: build/trans_presets.java:671 build/trans_presets.java:692
+#: build/trans_presets.java:1294
 msgid "Cross by bicycle"
 msgstr "以自行車穿越"
@@ -23248,11 +23461,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:657 build/trans_presets.java:672
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:672 build/trans_presets.java:694
+#: build/trans_presets.java:1295
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:658
+#: build/trans_presets.java:673
 msgid "Crossing type name (UK)"
 msgstr "行人穿越道類型名稱 (英國)"
@@ -23260,30 +23473,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "zebra"
 msgstr "斑馬線"
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:658 build/trans_presets.java:673
+#: build/trans_presets.java:673 build/trans_presets.java:695
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:661
+#: build/trans_presets.java:676
 msgid "Stop"
 msgstr "禁止通行"
@@ -23291,67 +23504,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:664
-msgid "Pedestrian Crossing"
-msgstr "行人穿越道"
-
-#. item "Waypoints/Pedestrian Crossing"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:667
-msgid "Edit Crossing"
-msgstr "編輯行人穿越道"
-
-#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:673
-msgid "Type name (UK)"
-msgstr "類型名稱 (英國)"
-
-#: build/trans_presets.java:675
-msgid "Traffic Calming"
-msgstr "道路減速設施"
-
-#. item "Waypoints/Traffic Calming"
-#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:677
-msgid "Edit Traffic Calming"
-msgstr "編輯道路減速設施"
-
-#: build/trans_presets.java:678
-msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "chicane"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "choker"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "cushion"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "hump"
-msgstr ""
-
-#: build/trans_presets.java:678
-msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:680
-msgid "Passing Place"
-msgstr "讓車處"
-
-#. item "Waypoints/Passing Place"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:682
-msgid "Edit Passing Place"
-msgstr "編輯讓車處"
-
-#. item "Waypoints/Passing Place" label "Edit Passing Place"
-#. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:685
+#: build/trans_presets.java:679
 msgid "Mini-roundabout"
 msgstr "小型圓環"
@@ -23362,14 +23513,76 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:690
+#: build/trans_presets.java:684
 msgid "clockwise"
 msgstr "順時針"
 
-#: build/trans_presets.java:692
+#: build/trans_presets.java:686
+msgid "Pedestrian Crossing"
+msgstr "行人穿越道"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:689
+msgid "Edit Crossing"
+msgstr "編輯行人穿越道"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:695
+msgid "Type name (UK)"
+msgstr "類型名稱 (英國)"
+
+#: build/trans_presets.java:697
+msgid "Traffic Calming"
+msgstr "道路減速設施"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:699
+msgid "Edit Traffic Calming"
+msgstr "編輯道路減速設施"
+
+#: build/trans_presets.java:700
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:700
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:702
+msgid "Passing Place"
+msgstr "讓車處"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:704
+msgid "Edit Passing Place"
+msgstr "編輯讓車處"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:707
 msgid "Turning Circle"
 msgstr "迴旋圈"
@@ -23379,5 +23592,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:712
 msgid "City Limit"
 msgstr "城市邊界"
@@ -23385,15 +23598,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:699
+#: build/trans_presets.java:714
 msgid "Edit City Limit Sign"
 msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:719
 msgid "Second Name"
 msgstr "第二名稱"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:706
+#: build/trans_presets.java:721
 msgid "Speed Camera"
 msgstr "測速照相"
@@ -23402,11 +23615,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:710
-msgid "Emergency Phone"
-msgstr "緊急電話"
-
-#. item "Waypoints/Emergency Phone"
-#. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:713
+#. <separator/>
+#: build/trans_presets.java:726
 msgid "Incline"
 msgstr "坡"
@@ -23414,5 +23622,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:716
+#: build/trans_presets.java:729
 msgid "Incline Steep"
 msgstr "險升/降坡"
@@ -23420,5 +23628,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:732
 msgid "Grit Bin"
 msgstr ""
@@ -23428,10 +23636,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:724
+#: build/trans_presets.java:737
 msgid "Ford"
 msgstr "淺灘"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:738
 msgid "Edit Ford"
 msgstr "編輯淺灘"
@@ -23439,5 +23647,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:732
+#: build/trans_presets.java:745
 msgid "Mountain Pass"
 msgstr "鞍部"
@@ -23445,5 +23653,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:747
 msgid "Edit Mountain Pass"
 msgstr "編輯鞍部"
@@ -23452,10 +23660,10 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Geography/Places/Peak" text "Name"
-#. item "Geography/Places/Glacier" text "Name"
-#. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1683
-#: build/trans_presets.java:1952 build/trans_presets.java:3129
-#: build/trans_presets.java:3136 build/trans_presets.java:3143
+#. item "Geography/Peak" text "Name"
+#. item "Geography/Glacier" text "Name"
+#. item "Geography/Volcano" text "Name"
+#: build/trans_presets.java:752 build/trans_presets.java:1764
+#: build/trans_presets.java:2048 build/trans_presets.java:3239
+#: build/trans_presets.java:3246 build/trans_presets.java:3253
 msgid "Elevation"
 msgstr "海拔"
@@ -23463,5 +23671,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:743
+#: build/trans_presets.java:756
 msgid "Barriers"
 msgstr "障礙物"
@@ -23469,5 +23677,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:746
+#: build/trans_presets.java:759
 msgid "Bollard"
 msgstr "車阻柱"
@@ -23475,5 +23683,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:748
+#: build/trans_presets.java:761
 msgid "Edit Bollard"
 msgstr "編輯車阻柱"
@@ -23518,16 +23726,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:764 build/trans_presets.java:783
+#: build/trans_presets.java:797 build/trans_presets.java:819
+#: build/trans_presets.java:856 build/trans_presets.java:869
+#: build/trans_presets.java:881 build/trans_presets.java:893
+#: build/trans_presets.java:905 build/trans_presets.java:917
+#: build/trans_presets.java:927 build/trans_presets.java:936
+#: build/trans_presets.java:945
 msgid "Allowed traffic:"
 msgstr "允許通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:771
 msgid "Cycle Barrier"
 msgstr "自行車護欄"
@@ -23536,5 +23744,5 @@
 #. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:762
+#: build/trans_presets.java:775
 msgid "Block"
 msgstr "水泥護欄"
@@ -23542,5 +23750,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:778
 msgid "Cattle Grid"
 msgstr "家畜柵欄"
@@ -23548,10 +23756,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:767
+#: build/trans_presets.java:780
 msgid "Edit Cattle Grid"
 msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:790
 msgid "Bus Trap"
 msgstr "公車專用道障礙"
@@ -23559,15 +23767,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:780
+#: build/trans_presets.java:793
 msgid "Spikes"
 msgstr "長釘"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:794
 msgid "Edit Spikes"
 msgstr "編輯長釘"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:805
 msgid "Toll Booth"
 msgstr "收費站"
@@ -23575,5 +23783,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:807
 msgid "Edit Toll Booth"
 msgstr "編輯收費站"
@@ -23581,10 +23789,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:802
+#: build/trans_presets.java:815
 msgid "Border Control"
 msgstr "國境管控站"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:816
 msgid "Edit Border Control"
 msgstr "編輯國境管控站"
@@ -23593,5 +23801,5 @@
 #. <separator/>
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:817
+#: build/trans_presets.java:830
 msgid "Hedge"
 msgstr "籬笆"
@@ -23602,22 +23810,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:821 build/trans_presets.java:823
+#: build/trans_presets.java:834 build/trans_presets.java:836
 msgid "Fence"
 msgstr "欄柵"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "fence"
 msgstr "欄柵"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:836
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:825
+#: build/trans_presets.java:838
 msgid "Wall"
 msgstr "牆"
@@ -23625,5 +23833,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:828
+#: build/trans_presets.java:841
 msgid "City Wall"
 msgstr "城牆"
@@ -23632,5 +23840,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:845
 msgid "Retaining Wall"
 msgstr "擋土牆"
@@ -23641,10 +23849,10 @@
 #. <separator/>
 #. <!-- *** access *** -->
-#: build/trans_presets.java:839
+#: build/trans_presets.java:852
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:853
 msgid "Edit Entrance"
 msgstr "編輯入口"
@@ -23652,5 +23860,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:851 build/trans_presets.java:1580
+#: build/trans_presets.java:864 build/trans_presets.java:1661
 msgid "Gate"
 msgstr "閘門"
@@ -23658,50 +23866,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:853
+#: build/trans_presets.java:866
 msgid "Edit Gate"
 msgstr "編輯閘門"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:877
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:878
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:889
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:890
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:901
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:889
+#: build/trans_presets.java:902
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:900
+#: build/trans_presets.java:913
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:901
+#: build/trans_presets.java:914
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:922
 msgid "Stile"
 msgstr "柵欄台階"
@@ -23709,25 +23917,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:911
+#: build/trans_presets.java:924
 msgid "Edit Stile"
 msgstr "編輯柵欄台階"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:919
+#: build/trans_presets.java:932
 msgid "Turnstile"
 msgstr "旋轉柵門"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:933
 msgid "Edit Turnstile"
 msgstr "編輯旋轉柵門"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:941
 msgid "Sally Port"
 msgstr "城門"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:942
 msgid "Edit Sally Port"
 msgstr "編輯城門"
@@ -23735,25 +23943,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #. group "Water"
-#. item "Water/Water/River" combo "Layer"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:943 build/trans_presets.java:944
-#: build/trans_presets.java:995
+#: build/trans_presets.java:956 build/trans_presets.java:957
+#: build/trans_presets.java:1048
 msgid "Water"
 msgstr "水域"
 
 #. group "Water/Water"
-#: build/trans_presets.java:945
-msgid "Spring"
-msgstr "泉"
-
-#. item "Water/Water/Spring"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:947
-msgid "Edit Spring"
-msgstr "編輯泉"
-
-#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:952
+#: build/trans_presets.java:959
 msgid "Drain"
 msgstr "排水溝"
@@ -23761,10 +23958,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:954
+#: build/trans_presets.java:961
 msgid "Edit Drain"
 msgstr "編輯排水溝"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:967
 msgid "Ditch"
 msgstr ""
@@ -23772,10 +23969,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:962
+#: build/trans_presets.java:969
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:975
 msgid "Stream"
 msgstr "溪流"
@@ -23783,10 +23980,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:970
+#: build/trans_presets.java:977
 msgid "Edit Stream"
 msgstr "編輯溪流"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:983
 msgid "Canal"
 msgstr "運河"
@@ -23794,10 +23991,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:978
+#: build/trans_presets.java:985
 msgid "Edit Canal"
 msgstr "編輯運河"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:991
 msgid "River"
 msgstr "河流"
@@ -23807,59 +24004,113 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:988
+#: build/trans_presets.java:995
 msgid "Edit River"
 msgstr "編輯河流"
 
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:1002
+msgid "Spring"
+msgstr "泉"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1004
+msgid "Edit Spring"
+msgstr "編輯泉"
+
+#. item "Water/Water/Spring" text "Name"
+#: build/trans_presets.java:1008
+msgid "Waterfall"
+msgstr "瀑布"
+
+#. item "Water/Water/Waterfall"
+#: build/trans_presets.java:1009
+msgid "Edit Waterfall"
+msgstr "編輯瀑布"
+
+#. item "Water/Water/Waterfall" text "Name"
+#: build/trans_presets.java:1014
+msgid "Weir"
+msgstr "堰"
+
+#. item "Water/Water/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1016
+msgid "Edit Weir"
+msgstr "編輯堰"
+
+#. item "Water/Water/Weir" text "Name"
+#: build/trans_presets.java:1021
+msgid "Dam"
+msgstr "水壩"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1023
+msgid "Edit Dam"
+msgstr "編輯水壩"
+
+#. item "Water/Water/Dam" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1029
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1030
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1035
+msgid "Reservoir"
+msgstr "貯水處"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1037
+msgid "Edit Reservoir Landuse"
+msgstr "編輯貯水處"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1042
+msgid "Covered Reservoir"
+msgstr "有覆蓋的貯水處"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1043
+msgid "Edit Covered Reservoir"
+msgstr "編輯有覆蓋的貯水處"
+
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1050
 msgid "Edit Water"
 msgstr "編輯水域"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1054
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1002
+#: build/trans_presets.java:1055
 msgid "Edit Land"
 msgstr "編輯陸地"
 
 #. item "Water/Water/Land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1007
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin"
-#: build/trans_presets.java:1008
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1013
-msgid "Reservoir"
-msgstr "貯水處"
-
-#. item "Water/Water/Reservoir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1015
-msgid "Edit Reservoir Landuse"
-msgstr "編輯貯水處"
-
-#. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1020
-msgid "Covered Reservoir"
-msgstr "有覆蓋的貯水處"
-
-#. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1021
-msgid "Edit Covered Reservoir"
-msgstr "編輯有覆蓋的貯水處"
-
-#. item "Water/Water/Covered Reservoir" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1059
+msgid "Coastline"
+msgstr "海岸線"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1061
+msgid "Edit Coastline"
+msgstr "編輯海岸線"
+
+#. item "Water/Water/Coastline" text "Name"
+#: build/trans_presets.java:1065
 msgid "Riverbank"
 msgstr "河岸"
@@ -23868,10 +24119,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1068
 msgid "Edit Riverbank"
 msgstr "編輯河岸"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1033
+#. <separator/>
+#: build/trans_presets.java:1073
 msgid "Wetland"
 msgstr "溼地"
@@ -23882,14 +24134,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:1038
+#: build/trans_presets.java:1078
 msgid "Edit Wetland"
 msgstr "編輯溼地"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "swamp"
 msgstr "沼澤"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "bog"
 msgstr "泥沼"
@@ -23903,35 +24155,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1081
 msgid "mangrove"
 msgstr "紅樹林"
 
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1083
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1084
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1088
 msgid "Beach"
 msgstr "海灘"
@@ -23939,20 +24191,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1090
 msgid "Edit Beach"
 msgstr "編輯海灘"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1094
 msgid "Bay"
 msgstr "海灣"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1055
+#: build/trans_presets.java:1095
 msgid "Edit Bay"
 msgstr "編輯海灣"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1099
 msgid "Cliff"
 msgstr "斷崖"
@@ -23960,145 +24212,216 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1101
 msgid "Edit Cliff"
 msgstr "編輯斷崖"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1065
-msgid "Coastline"
-msgstr "海岸線"
-
-#. item "Water/Water/Coastline"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1067
-msgid "Edit Coastline"
-msgstr "編輯海岸線"
-
-#. item "Water/Water/Coastline" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1106
+#, fuzzy
+msgid "Shipping"
+msgstr "購物"
+
+#. group "Shipping"
+#: build/trans_presets.java:1107
+msgid "Ferry Terminal"
+msgstr "渡輪端點"
+
+#. item "Shipping/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1109
+msgid "Edit Ferry Terminal"
+msgstr "編輯渡輪端點"
+
+#. item "Shipping/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "Cargo"
+msgstr "汽車"
+
+#. item "Shipping/Ferry Terminal" combo "Cargo"
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "passengers"
+msgstr "OpenLayers"
+
+#: build/trans_presets.java:1112
+#, fuzzy
+msgid "vehicle"
+msgstr "新手"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_style.java:233 build/trans_style.java:689
+#: build/trans_style.java:715 build/trans_style.java:723
+#: build/trans_style.java:748 build/trans_style.java:757
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:966
+msgid "bicycle"
+msgstr "單車"
+
+#: build/trans_presets.java:1112
+msgid "hgv"
+msgstr ""
+
+#: build/trans_presets.java:1112
+msgid "passengers;vehicle"
+msgstr ""
+
+#: build/trans_presets.java:1114
 msgid "Ferry Route"
 msgstr "渡輪路線"
 
-#. item "Water/Water/Ferry Route"
+#. item "Shipping/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1116
 msgid "Edit Ferry"
 msgstr "編輯渡輪"
 
-#. item "Water/Water/Ferry Route" text "Name"
+#. item "Shipping/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1082
-msgid "Boatyard"
-msgstr "造船廠"
-
-#. item "Water/Water/Boatyard"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1084
-msgid "Edit Boatyard"
-msgstr "編輯造船廠"
-
-#. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1089
-msgid "Dock"
-msgstr "船塢"
-
-#. item "Water/Water/Dock"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1091
-msgid "Edit Dock"
-msgstr "編輯船塢"
-
-#. item "Water/Water/Dock" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1097
-msgid "Dam"
-msgstr "水壩"
-
-#. item "Water/Water/Dam"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1099
-msgid "Edit Dam"
-msgstr "編輯水壩"
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1105
-msgid "Waterway Point"
-msgstr "水路點"
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1124
+msgid "Marina"
+msgstr "碼頭"
+
+#. item "Shipping/Marina"
+#: build/trans_presets.java:1125
+msgid "Edit Marina"
+msgstr "編輯碼頭"
+
+#. item "Shipping/Marina" text "Name"
+#: build/trans_presets.java:1129
+msgid "Pier"
+msgstr "渡頭"
+
+#. item "Shipping/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1131
+msgid "Edit Pier"
+msgstr "編輯渡頭"
+
+#. item "Shipping/Pier" text "Name"
+#: build/trans_presets.java:1135
 msgid "Lock Gate"
 msgstr "調節水門"
 
-#. item "Waterway Point/Lock Gate"
+#. item "Shipping/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1110
-msgid "Weir"
-msgstr "堰"
-
-#. item "Waterway Point/Weir"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1112
-msgid "Edit Weir"
-msgstr "編輯堰"
-
-#. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1117
-msgid "Waterfall"
-msgstr "瀑布"
-
-#. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1118
-msgid "Edit Waterfall"
-msgstr "編輯瀑布"
-
-#. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1139
 msgid "Turning Point"
 msgstr "調轉點"
 
-#. item "Waterway Point/Turning Point"
+#. item "Shipping/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1127
-msgid "Marina"
-msgstr "碼頭"
-
-#. item "Waterway Point/Marina"
-#: build/trans_presets.java:1128
-msgid "Edit Marina"
-msgstr "編輯碼頭"
-
-#. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1132
-msgid "Pier"
-msgstr "渡頭"
-
-#. item "Waterway Point/Pier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1134
-msgid "Edit Pier"
-msgstr "編輯渡頭"
-
-#. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1138
-msgid "Ferry Terminal"
-msgstr "渡輪端點"
-
-#. item "Waterway Point/Ferry Terminal"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1140
-msgid "Edit Ferry Terminal"
-msgstr "編輯渡輪端點"
-
-#. item "Waterway Point/Ferry Terminal" text "Name"
+#. <separator/>
 #: build/trans_presets.java:1144
 msgid "Slipway"
 msgstr "船臺"
 
-#. item "Waterway Point/Slipway"
+#. item "Shipping/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -24108,16 +24431,38 @@
 msgstr "編輯造船臺"
 
-#. item "Waterway Point/Slipway" text "Name"
+#. item "Shipping/Slipway" text "Name"
+#: build/trans_presets.java:1152
+msgid "Boatyard"
+msgstr "造船廠"
+
+#. item "Shipping/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #: build/trans_presets.java:1154
+msgid "Edit Boatyard"
+msgstr "編輯造船廠"
+
+#. item "Shipping/Boatyard" text "Name"
+#: build/trans_presets.java:1159
+msgid "Dock"
+msgstr "船塢"
+
+#. item "Shipping/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1161
+msgid "Edit Dock"
+msgstr "編輯船塢"
+
+#. item "Shipping/Dock" text "Name"
+#: build/trans_presets.java:1168
 msgid "Transport"
 msgstr "運輸"
 
 #. group "Transport"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1169
 msgid "Railway"
 msgstr "鐵路"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1170
 msgid "Rail"
 msgstr "軌"
@@ -24125,5 +24470,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1158
+#: build/trans_presets.java:1172
 msgid "Edit Rail"
 msgstr "編輯軌道"
@@ -24153,7 +24498,7 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
+#: build/trans_presets.java:1176 build/trans_presets.java:1188
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1248
 msgid "Gauge (mm)"
 msgstr "軌距 (mm)"
@@ -24169,8 +24514,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249
 msgid "Types"
 msgstr "類型"
@@ -24184,29 +24529,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:1264
+#: build/trans_presets.java:1177 build/trans_presets.java:1189
+#: build/trans_presets.java:1201 build/trans_presets.java:1213
+#: build/trans_presets.java:1225 build/trans_presets.java:1237
+#: build/trans_presets.java:1249 build/trans_presets.java:1278
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "Electrified"
 msgstr ""
@@ -24219,8 +24564,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250
 msgid "contact_line"
 msgstr "連接線"
@@ -24291,8 +24636,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236 build/trans_style.java:781
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1238
+#: build/trans_presets.java:1250 build/trans_style.java:781
 #: build/trans_style.java:1207 build/trans_style.java:1271
 #: build/trans_style.java:1279 build/trans_style.java:1288
@@ -24304,8 +24649,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1165 build/trans_presets.java:1177
-#: build/trans_presets.java:1189 build/trans_presets.java:1201
-#: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2642
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1239
+#: build/trans_presets.java:1251 build/trans_presets.java:2736
 msgid "Voltage"
 msgstr "電壓"
@@ -24318,8 +24663,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "Frequency (Hz)"
 msgstr "頻率 (Hz)"
@@ -24332,23 +24677,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1166 build/trans_presets.java:1178
-#: build/trans_presets.java:1190 build/trans_presets.java:1202
-#: build/trans_presets.java:1214 build/trans_presets.java:1226
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:1240
+#: build/trans_presets.java:1252
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1183
 msgid "Narrow Gauge Rail"
 msgstr "窄軌"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1184
 msgid "Edit Narrow Gauge Rail"
 msgstr "編輯窄軌"
 
 #. </optional>
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1195
 msgid "Monorail"
 msgstr "單軌"
@@ -24356,50 +24701,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1197
 msgid "Edit Monorail"
 msgstr "編輯單軌"
 
 #. </optional>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1207
 msgid "Preserved"
 msgstr "保留鐵路"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1208
 msgid "Edit Preserved Railway"
 msgstr "編輯保留的鐵路"
 
 #. </optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1219
 msgid "Light Rail"
 msgstr "輕軌電車"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1220
 msgid "Edit Light Rail"
 msgstr "編輯輕軌電車"
 
 #. </optional>
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1231
 msgid "Subway"
 msgstr "地下鐵"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1232
 msgid "Edit Subway"
 msgstr "編輯地下鐵"
 
 #. </optional>
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1243
 msgid "Tram"
 msgstr "路面電車"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1244
 msgid "Edit Tram"
 msgstr "編輯路面電車"
 
 #. </optional>
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1255
 msgid "Bus Guideway"
 msgstr "導軌道巴士"
@@ -24407,5 +24752,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1257
 msgid "Edit Bus Guideway"
 msgstr "編輯導軌道巴士"
@@ -24414,10 +24759,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1274
 msgid "Disused Rail"
 msgstr "不使用的軌道"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1275
 msgid "Edit Disused Railway"
 msgstr "編輯不使用的鐵路"
@@ -24426,9 +24771,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1278
 msgid "Optional Types"
 msgstr "選擇性的類型"
 
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1280
 msgid "Abandoned Rail"
 msgstr "廢棄的軌道"
@@ -24437,5 +24782,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1284
 msgid "Level Crossing"
 msgstr "鐵路平交道"
@@ -24444,5 +24789,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1288
 msgid "Crossing"
 msgstr "平交道"
@@ -24452,5 +24797,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1292
 msgid "Crossing type"
 msgstr "平交道類型"
@@ -24458,5 +24803,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1298
 msgid "Turntable"
 msgstr "調車轉盤"
@@ -24465,5 +24810,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1302
 msgid "Buffer Stop"
 msgstr "緩衝停止點"
@@ -24472,10 +24817,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1307
 msgid "Aerialway"
 msgstr "空中路線"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1308
 msgid "Chair Lift"
 msgstr "滑雪纜車"
@@ -24483,10 +24828,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1310
 msgid "Edit Chair Lift"
 msgstr "編輯滑雪纜車"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1314
 msgid "Drag Lift"
 msgstr ""
@@ -24494,10 +24839,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1316
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1320
 msgid "Cable Car"
 msgstr "大型纜車"
@@ -24505,10 +24850,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1322
 msgid "Edit Cable Car"
 msgstr "編輯大型纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1326
 msgid "Gondola"
 msgstr "纜車"
@@ -24516,10 +24861,11 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1328
 msgid "Edit Gondola"
 msgstr "編輯纜車"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1318
+#. <separator/>
+#: build/trans_presets.java:1333
 msgctxt "aerialway"
 msgid "Station"
@@ -24528,5 +24874,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1335
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24534,5 +24880,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1339
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24541,5 +24887,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1341
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24547,5 +24893,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1348
 msgid "Fuel"
 msgstr "加油站"
@@ -24555,69 +24901,92 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1352
 msgid "Edit Fuel"
 msgstr "編輯加油站"
 
-#. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1339
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Tyres" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" text "Name"
+#: build/trans_presets.java:1354 build/trans_presets.java:1398
+#: build/trans_presets.java:1413 build/trans_presets.java:1421
+#: build/trans_presets.java:1436 build/trans_presets.java:1445
+#: build/trans_presets.java:1464
+#, fuzzy
+msgid "Brand"
+msgstr "陸地"
+
+#. item "Car/Fuel" combo "Brand"
+#: build/trans_presets.java:1354
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1354
 msgid "Total"
 msgstr "總計"
 
-#: build/trans_presets.java:1339
-msgid "Indipend."
-msgstr ""
-
-#. item "Car/Fuel" text "Name"
+#. item "Motorcycle/Motorcycle Dealer" combo "Brand"
+#: build/trans_presets.java:1354 build/trans_presets.java:1464
+#, fuzzy
+msgid "Independent"
+msgstr "遞增"
+
+#. item "Car/Fuel" text "Operator"
+#. item "Car/Wash" text "Operator"
+#. item "Car/Repair" text "Operator"
+#. item "Car/Tyres" text "Operator"
+#. item "Car/Rental" text "Operator"
+#. item "Car/Sharing" text "Operator"
+#. item "Motorcycle/Motorcycle Dealer" text "Operator"
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Food Court" text "Name"
-#. item "Food+Drinks/Cafe" text "Operator"
 #. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
@@ -24634,34 +25003,35 @@
 #. item "Sports/Sport Facilities/Miniature Golf" text "Name"
 #. item "Man-Made/Buildings/Library" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#. item "Shops/Supermarket" text "Name"
+#. item "Food/Supermarket" text "Name"
+#. item "Food/Convenience Store" text "Name"
+#. item "Food/Kiosk" text "Name"
+#. item "Food/Butcher" text "Name"
+#. item "Food/Baker" text "Name"
+#. item "Food/Organic" text "Name"
+#. item "Food/Alcohol" text "Name"
+#. item "Food/Beverages" text "Name"
 #. item "Shops/Chemist" text "Name"
-#. item "Shops/Convenience Store" text "Name"
-#. item "Shops/Kiosk" text "Name"
-#. item "Shops/Book Store" text "Name"
-#. item "Shops/Travel Agency" text "Name"
-#. item "Shops/Butcher" text "Name"
-#. item "Shops/Baker" text "Name"
-#. item "Shops/Florist" text "Name"
-#. item "Shops/Organic" text "Name"
-#. item "Shops/Alcohol" text "Name"
-#. item "Shops/Beverages" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Shops/Clothes" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Tailor" text "Name"
 #. item "Shops/Computer" text "Name"
 #. item "Shops/Electronics" text "Name"
 #. item "Shops/Hifi" text "Name"
-#. item "Shops/Furniture" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Florist" text "Name"
 #. item "Shops/Garden Centre" text "Name"
 #. item "Shops/Hardware" text "Name"
 #. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Furniture" text "Name"
 #. item "Shops/Stationery" text "Name"
-#. item "Shops/Hairdresser" text "Name"
-#. item "Shops/Shoes" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
 #. item "Shops/Toys" text "Name"
-#. item "Shops/Video" text "Name"
-#. item "Shops/Dry Cleaning" text "Name"
-#. item "Shops/Laundry" text "Name"
-#. item "Shops/Outdoor" text "Name"
-#. item "Shops/Sports" text "Name"
-#. item "Shops/Optician" text "Name"
 #. item "Cash/Bank" text "Operator"
 #. item "Cash/Money Exchange" text "Name"
@@ -24669,37 +25039,48 @@
 #. item "Health/Dentist" text "Name"
 #. item "Health/Pharmacy" text "Name"
+#. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1885 build/trans_presets.java:1893
-#: build/trans_presets.java:1906 build/trans_presets.java:1920
-#: build/trans_presets.java:2021 build/trans_presets.java:2029
-#: build/trans_presets.java:2132 build/trans_presets.java:2138
-#: build/trans_presets.java:2469 build/trans_presets.java:2493
-#: build/trans_presets.java:2734 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1961
+#: build/trans_presets.java:1968 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:2016
+#: build/trans_presets.java:2104 build/trans_presets.java:2112
+#: build/trans_presets.java:2215 build/trans_presets.java:2221
+#: build/trans_presets.java:2585 build/trans_presets.java:2609
+#: build/trans_presets.java:2829 build/trans_presets.java:2836
+#: build/trans_presets.java:2843 build/trans_presets.java:2850
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2884 build/trans_presets.java:2890
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2909 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+#: build/trans_presets.java:2936 build/trans_presets.java:2942
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2989 build/trans_presets.java:2996
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3052
+#: build/trans_presets.java:3060 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3089
+#: build/trans_presets.java:3102 build/trans_presets.java:3123
 msgid "Opening Hours"
 msgstr "開放時間"
 
 #. item "Car/Fuel" combo "Opening Hours"
+#. item "Car/Wash" combo "Opening Hours"
+#. item "Car/Repair" combo "Opening Hours"
+#. item "Car/Tyres" combo "Opening Hours"
+#. item "Car/Rental" combo "Opening Hours"
+#. item "Car/Sharing" combo "Opening Hours"
+#. item "Motorcycle/Motorcycle Dealer" combo "Opening Hours"
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
@@ -24720,33 +25101,35 @@
 #. item "Man-Made/Buildings/Library" combo "Opening Hours"
 #. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
-#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Food/Supermarket" combo "Opening Hours"
+#. item "Food/Convenience Store" combo "Opening Hours"
+#. item "Food/Kiosk" combo "Opening Hours"
+#. item "Food/Butcher" combo "Opening Hours"
+#. item "Food/Baker" combo "Opening Hours"
+#. item "Food/Organic" combo "Opening Hours"
+#. item "Food/Alcohol" combo "Opening Hours"
+#. item "Food/Beverages" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
-#. item "Shops/Convenience Store" combo "Opening Hours"
-#. item "Shops/Kiosk" combo "Opening Hours"
-#. item "Shops/Book Store" combo "Opening Hours"
-#. item "Shops/Travel Agency" combo "Opening Hours"
-#. item "Shops/Butcher" combo "Opening Hours"
-#. item "Shops/Baker" combo "Opening Hours"
-#. item "Shops/Florist" combo "Opening Hours"
-#. item "Shops/Organic" combo "Opening Hours"
-#. item "Shops/Alcohol" combo "Opening Hours"
-#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Shops/Clothes" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Tailor" combo "Opening Hours"
 #. item "Shops/Computer" combo "Opening Hours"
 #. item "Shops/Electronics" combo "Opening Hours"
 #. item "Shops/Hifi" combo "Opening Hours"
-#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
 #. item "Shops/Garden Centre" combo "Opening Hours"
 #. item "Shops/Hardware" combo "Opening Hours"
 #. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
 #. item "Shops/Stationery" combo "Opening Hours"
-#. item "Shops/Hairdresser" combo "Opening Hours"
-#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
 #. item "Shops/Toys" combo "Opening Hours"
-#. item "Shops/Video" combo "Opening Hours"
-#. item "Shops/Dry Cleaning" combo "Opening Hours"
-#. item "Shops/Laundry" combo "Opening Hours"
-#. item "Shops/Outdoor" combo "Opening Hours"
-#. item "Shops/Sports" combo "Opening Hours"
-#. item "Shops/Optician" combo "Opening Hours"
 #. item "Cash/Bank" combo "Opening Hours"
 #. item "Cash/Money Exchange" combo "Opening Hours"
@@ -24755,170 +25138,191 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Mo-Fr 08:30-20:00"
 msgstr "週一-週五 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1738
-#: build/trans_presets.java:1758 build/trans_presets.java:1775
-#: build/trans_presets.java:1793 build/trans_presets.java:1812
-#: build/trans_presets.java:1828 build/trans_presets.java:1845
-#: build/trans_presets.java:1862 build/trans_presets.java:1885
-#: build/trans_presets.java:1893 build/trans_presets.java:1906
-#: build/trans_presets.java:1920 build/trans_presets.java:2021
-#: build/trans_presets.java:2029 build/trans_presets.java:2132
-#: build/trans_presets.java:2138 build/trans_presets.java:2469
-#: build/trans_presets.java:2493 build/trans_presets.java:2756
-#: build/trans_presets.java:2762 build/trans_presets.java:2769
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2795
-#: build/trans_presets.java:2802 build/trans_presets.java:2809
-#: build/trans_presets.java:2815 build/trans_presets.java:2822
-#: build/trans_presets.java:2828 build/trans_presets.java:2834
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
-#: build/trans_presets.java:2866 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2924
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2962 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2991
-#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#: build/trans_presets.java:1358 build/trans_presets.java:1400
+#: build/trans_presets.java:1415 build/trans_presets.java:1423
+#: build/trans_presets.java:1438 build/trans_presets.java:1447
+#: build/trans_presets.java:1466 build/trans_presets.java:1820
+#: build/trans_presets.java:1840 build/trans_presets.java:1857
+#: build/trans_presets.java:1876 build/trans_presets.java:1895
+#: build/trans_presets.java:1911 build/trans_presets.java:1928
+#: build/trans_presets.java:1945 build/trans_presets.java:1968
+#: build/trans_presets.java:1976 build/trans_presets.java:1982
+#: build/trans_presets.java:2016 build/trans_presets.java:2104
+#: build/trans_presets.java:2112 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2585
+#: build/trans_presets.java:2609 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2975
+#: build/trans_presets.java:2982 build/trans_presets.java:2989
+#: build/trans_presets.java:2996 build/trans_presets.java:3002
+#: build/trans_presets.java:3008 build/trans_presets.java:3014
+#: build/trans_presets.java:3020 build/trans_presets.java:3026
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3089 build/trans_presets.java:3123
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1343
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "With shop"
+msgstr "編輯鞋店"
+
+#: build/trans_presets.java:1359
+#, fuzzy
+msgid "convenience"
+msgstr "便利商店"
+
+#: build/trans_presets.java:1359
+msgid "kiosk"
+msgstr ""
+
+#: build/trans_presets.java:1360
 msgid "Fuel types:"
 msgstr "燃料類型："
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1361
 msgid "Diesel"
 msgstr "柴油"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1362
 msgid "Bio Diesel"
 msgstr "生質柴油"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1363
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1364
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "重型貨車柴油"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1365
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1366
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1367
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1368
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1369
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1370
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1371
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (液化石油氣)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1372
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (壓縮天然氣)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1373
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1374
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24926,4 +25330,5 @@
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #. </optional>
+#. group "Motorcycle"
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -24935,6 +25340,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1361 build/trans_presets.java:1407
-#: build/trans_surveyor.java:24
+#: build/trans_presets.java:1377 build/trans_presets.java:1451
+#: build/trans_presets.java:1481 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "停車場"
@@ -24943,5 +25348,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:1364
+#: build/trans_presets.java:1380
 msgid "Edit Parking"
 msgstr "編輯停車場"
@@ -24952,25 +25357,27 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1973
-#: build/trans_presets.java:1983 build/trans_presets.java:2653
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:1383 build/trans_presets.java:2069
+#: build/trans_presets.java:2079 build/trans_presets.java:2747
+#: build/trans_presets.java:3035
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1368
+#. item "Motorcycle/Parking" combo "Type"
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "multi-storey"
 msgstr "塔式"
 
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
 msgid "surface"
 msgstr "平面式"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2563
+#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:2657
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1385
 msgid "Park and Ride"
 msgstr ""
@@ -24979,54 +25386,198 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1974
-#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:1386 build/trans_presets.java:1457
+#: build/trans_presets.java:2070 build/trans_presets.java:2080
+#: build/trans_presets.java:2748
 msgid "Fee"
 msgstr "費用"
 
 #. <space />
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1388
 msgid "Capacity (overall)"
 msgstr "容量 (整體)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1389
 msgid "Spaces for Disabled"
 msgstr "殘障專用空間"
 
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1390
 msgid "Spaces for Women"
 msgstr "女性專用空間"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1391
 msgid "Spaces for Parents"
 msgstr "父母專用空間"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1392
 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:1378
+#: build/trans_presets.java:1394
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1395
 msgid "Edit Car Wash"
 msgstr "編輯"
 
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1402
+msgid "Car Dealer"
+msgstr "汽車經銷商"
+
+#. item "Car/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1404
+msgid "Edit Car Shop"
+msgstr "編輯汽車商店"
+
+#. item "Car/Car Dealer" text "Operator"
+#: build/trans_presets.java:1409 build/trans_presets.java:1470
 msgid "Repair"
 msgstr "修車場"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1410
 msgid "Edit Car Repair"
 msgstr "編輯修車場"
 
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1390 build/trans_presets.java:1414
+#: build/trans_presets.java:1417
+#, fuzzy
+msgid "Tyres"
+msgstr "類型"
+
+#. item "Car/Tyres"
+#: build/trans_presets.java:1418
+#, fuzzy
+msgid "Edit Tyres"
+msgstr "編輯樹"
+
+#: build/trans_presets.java:1424 build/trans_presets.java:1473
+#, fuzzy
+msgid "Contact:"
+msgstr "內容"
+
+#. item "Car/Tyres" label "Contact:"
+#. item "Motorcycle/Motorcycle Dealer" label "Contact:"
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#. item "Annotation/Contact" label "Edit Contact information"
+#. <space />
+#: build/trans_presets.java:1425 build/trans_presets.java:1474
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_presets.java:1950
+#: build/trans_presets.java:3113 build/trans_presets.java:3517
+msgid "Phone Number"
+msgstr "電話號碼"
+
+#. item "Car/Tyres" text "Phone Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Phone Number"
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#. item "Annotation/Contact" text "Phone Number"
+#: build/trans_presets.java:1426 build/trans_presets.java:1475
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1951
+#: build/trans_presets.java:3518
+msgid "Fax Number"
+msgstr ""
+
+#. item "Car/Tyres" text "Fax Number"
+#. item "Motorcycle/Motorcycle Dealer" text "Fax Number"
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#. item "Annotation/Contact" text "Fax Number"
+#. <space />
+#: build/trans_presets.java:1427 build/trans_presets.java:1476
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
+#: build/trans_presets.java:3520
+msgid "Website"
+msgstr ""
+
+#. item "Car/Tyres" text "Website"
+#. item "Motorcycle/Motorcycle Dealer" text "Website"
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#. item "Annotation/Contact" text "Website"
+#: build/trans_presets.java:1428 build/trans_presets.java:1477
+#: build/trans_presets.java:1688 build/trans_presets.java:1706
+#: build/trans_presets.java:1722 build/trans_presets.java:1739
+#: build/trans_presets.java:1757 build/trans_presets.java:1774
+#: build/trans_presets.java:1791 build/trans_presets.java:1808
+#: build/trans_presets.java:1831 build/trans_presets.java:1850
+#: build/trans_presets.java:1867 build/trans_presets.java:1886
+#: build/trans_presets.java:1905 build/trans_presets.java:1921
+#: build/trans_presets.java:1938 build/trans_presets.java:1953
+#: build/trans_presets.java:3521
+msgid "Email Address"
+msgstr ""
+
+#. item "Car/Tyres" text "Email Address"
+#. item "Bicycle/Bike Dealer" text "Name"
+#: build/trans_presets.java:1430 build/trans_presets.java:1469
+#: build/trans_presets.java:1495
 msgid "Rental"
 msgstr "租車"
@@ -25035,10 +25586,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1433
 msgid "Edit Car Rental"
 msgstr "編輯租車"
 
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1440
 msgid "Sharing"
 msgstr "汽車分享"
@@ -25046,28 +25596,87 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Edit Car Sharing"
 msgstr "編輯汽車分享"
 
+#. item "Motorcycle/Parking"
+#: build/trans_presets.java:1452
+#, fuzzy
+msgid "Edit Motorcycle Parking"
+msgstr "編輯自行車停車場"
+
+#. item "Motorcycle/Parking" text "Name"
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1455 build/trans_presets.java:1486
+msgid "Capacity"
+msgstr "容量"
+
+#: build/trans_presets.java:1459
+#, fuzzy
+msgid "Motorcycle Dealer"
+msgstr "機車"
+
+#. item "Motorcycle/Motorcycle Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Edit Shop Motorcycle"
+msgstr "編輯高速公路"
+
+#: build/trans_presets.java:1467
+#, fuzzy
+msgid "Services:"
+msgstr "休息站"
+
+#. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1468
+#, fuzzy
+msgid "Sale"
+msgstr "比例"
+
+#: build/trans_presets.java:1470 build/trans_presets.java:1471
+#, fuzzy
+msgid "brand"
+msgstr "差"
+
+#: build/trans_presets.java:1471
+#, fuzzy
+msgid "Parts"
+msgstr "預設組合"
+
+#. item "Amenities/Recycling" check "Cans"
+#. <separator/>
+#: build/trans_presets.java:1472 build/trans_presets.java:2777
+#: build/trans_presets.java:2899
+msgid "Clothes"
+msgstr "衣服"
+
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1483
 msgid "Edit Bicycle Parking"
 msgstr "編輯自行車停車場"
 
-#. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1412
-msgid "Capacity"
-msgstr "容量"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1488
+msgid "Bike Dealer"
+msgstr "自行車經銷商"
+
+#. item "Bicycle/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:1491
+msgid "Edit Bicycle Shop"
+msgstr "編輯自行車商店"
 
 #. item "Bicycle/Rental"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1498
 msgid "Edit Bicycle Rental"
 msgstr "編輯自行車租用點"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1504
 msgctxt "railway"
 msgid "Station"
@@ -25077,5 +25686,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:1426
+#: build/trans_presets.java:1507
 msgctxt "railway"
 msgid "Edit Station"
@@ -25083,5 +25692,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1512
 msgid "UIC-Reference"
 msgstr "UIC-參考"
@@ -25089,5 +25698,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1515
 msgid "Railway Halt"
 msgstr ""
@@ -25095,5 +25704,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1517
 msgid "Edit Halt"
 msgstr ""
@@ -25101,5 +25710,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1524
 msgid "Tram Stop"
 msgstr "路面電車停靠"
@@ -25108,5 +25717,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:1446
+#: build/trans_presets.java:1527
 msgid "Edit Tram Stop"
 msgstr "編輯路面電車停靠"
@@ -25114,5 +25723,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1534
 msgid "Railway Platform"
 msgstr "鐵路月台"
@@ -25121,5 +25730,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:1456
+#: build/trans_presets.java:1537
 msgid "Edit Railway Platform"
 msgstr "編輯鐵路月台"
@@ -25131,5 +25740,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1459 build/trans_presets.java:1504
+#: build/trans_presets.java:1540 build/trans_presets.java:1585
 msgid "Reference (track number)"
 msgstr ""
@@ -25137,10 +25746,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1461 build/trans_presets.java:1506
+#: build/trans_presets.java:1542 build/trans_presets.java:1587
 msgid "Area"
 msgstr "區域"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1544
 msgid "Subway Entrance"
 msgstr "地下鐵入口"
@@ -25149,10 +25758,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:1466
+#: build/trans_presets.java:1547
 msgid "Edit Subway Entrance"
 msgstr "編輯地下鐵入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2655
+#: build/trans_presets.java:1552 build/trans_presets.java:2749
 msgid "Wheelchair"
 msgstr "輪椅"
@@ -25161,5 +25770,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1557
 msgid "Bus Station"
 msgstr "公車車站"
@@ -25168,5 +25777,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:1479
+#: build/trans_presets.java:1560
 msgid "Edit Bus Station"
 msgstr "編輯公車車站"
@@ -25174,5 +25783,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1485
+#: build/trans_presets.java:1566
 msgid "Bus Stop"
 msgstr "公車站牌"
@@ -25182,13 +25791,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1570
 msgid "Edit Bus Stop"
 msgstr "編輯公車站牌"
 
 #. item "Public Transport/Bus Stop" text "Name"
-#. item "Tourism/Other Information Points" text "Closer Description"
-#. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1996
-#: build/trans_presets.java:2705
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1575 build/trans_presets.java:1998
+#: build/trans_presets.java:2799
 msgid "Shelter"
 msgstr "涼亭"
@@ -25196,19 +25804,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2693
+#: build/trans_presets.java:1576 build/trans_presets.java:2787
 msgid "Bench"
 msgstr "長椅"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1577
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1581
 msgid "Bus Platform"
 msgstr "公車月台"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1582
 msgid "Edit Bus Platform"
 msgstr "編輯公車月台"
@@ -25216,5 +25824,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1590
 msgid "Taxi"
 msgstr "計程車"
@@ -25222,5 +25830,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1592
 msgid "Edit Taxi station"
 msgstr "編輯計程車招呼站"
@@ -25228,10 +25836,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1598
 msgid "Airport"
 msgstr "機場"
 
 #. group "Airport"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1599
 msgid "Airport Ground"
 msgstr "機場地面"
@@ -25239,5 +25847,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1520
+#: build/trans_presets.java:1601
 msgid "Edit Airport Ground"
 msgstr "編輯機場地面"
@@ -25245,10 +25853,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1605
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1606
 msgid "ICAO"
 msgstr "ICAO"
@@ -25257,5 +25865,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1610
 msgid "Runway"
 msgstr "飛機跑道"
@@ -25263,5 +25871,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1612
 msgid "Edit Runway"
 msgstr "編輯飛機跑道"
@@ -25269,5 +25877,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1618
 msgid "Taxiway"
 msgstr "滑行跑道"
@@ -25275,5 +25883,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1620
 msgid "Edit Taxiway"
 msgstr "編輯滑行跑道"
@@ -25281,5 +25889,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1626
 msgid "Helipad"
 msgstr "直升機停機坪"
@@ -25287,5 +25895,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1628
 msgid "Edit Helipad"
 msgstr "編輯直升機停機坪"
@@ -25295,5 +25903,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:1634 build/trans_presets.java:1636
 msgid "Apron"
 msgstr "停機坪"
@@ -25303,5 +25911,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Hangar"
 msgstr "飛機庫"
@@ -25312,6 +25920,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
+#: build/trans_presets.java:2673
 msgid "Beacon"
 msgstr ""
@@ -25321,5 +25929,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1568 build/trans_presets.java:1570
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
 msgid "Windsock"
 msgstr ""
@@ -25328,5 +25936,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1655
 msgid "Terminal"
 msgstr ""
@@ -25334,5 +25942,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1657
 msgid "Edit Terminal"
 msgstr ""
@@ -25340,15 +25948,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1663
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1669
 msgid "Travel"
 msgstr "旅遊"
 
 #. group "Travel"
-#: build/trans_presets.java:1589
+#: build/trans_presets.java:1670
 msgid "Accomodation"
 msgstr "住宿"
@@ -25360,5 +25968,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+#: build/trans_presets.java:1671 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅館"
@@ -25367,5 +25975,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1674
 msgid "Edit Hotel"
 msgstr "編輯旅館"
@@ -25378,8 +25986,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1615
-#: build/trans_presets.java:1631 build/trans_presets.java:1648
-#: build/trans_presets.java:1666 build/trans_presets.java:1699
-#: build/trans_presets.java:1716 build/trans_presets.java:1739
+#: build/trans_presets.java:1678 build/trans_presets.java:1696
+#: build/trans_presets.java:1712 build/trans_presets.java:1729
+#: build/trans_presets.java:1747 build/trans_presets.java:1781
+#: build/trans_presets.java:1798 build/trans_presets.java:1821
 msgid "Stars"
 msgstr "星級"
@@ -25403,34 +26011,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930
 msgid "wired"
 msgstr ""
@@ -25444,168 +26052,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1599 build/trans_presets.java:1617
-#: build/trans_presets.java:1633 build/trans_presets.java:1650
-#: build/trans_presets.java:1668 build/trans_presets.java:1685
-#: build/trans_presets.java:1701 build/trans_presets.java:1718
-#: build/trans_presets.java:1741 build/trans_presets.java:1760
-#: build/trans_presets.java:1777 build/trans_presets.java:1795
-#: build/trans_presets.java:1814 build/trans_presets.java:1830
-#: build/trans_presets.java:1847 build/trans_style.java:1352
+#: build/trans_presets.java:1680 build/trans_presets.java:1698
+#: build/trans_presets.java:1714 build/trans_presets.java:1731
+#: build/trans_presets.java:1749 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1800
+#: build/trans_presets.java:1823 build/trans_presets.java:1842
+#: build/trans_presets.java:1859 build/trans_presets.java:1878
+#: build/trans_presets.java:1897 build/trans_presets.java:1913
+#: build/trans_presets.java:1930 build/trans_style.java:1352
 msgid "terminal"
 msgstr ""
 
-#: build/trans_presets.java:1600 build/trans_presets.java:1618
-#: build/trans_presets.java:1634 build/trans_presets.java:1651
-#: build/trans_presets.java:1669 build/trans_presets.java:1686
-#: build/trans_presets.java:1702 build/trans_presets.java:1719
-#: build/trans_presets.java:1742 build/trans_presets.java:1761
-#: build/trans_presets.java:1778 build/trans_presets.java:1796
-#: build/trans_presets.java:1815 build/trans_presets.java:1831
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1681 build/trans_presets.java:1699
+#: build/trans_presets.java:1715 build/trans_presets.java:1732
+#: build/trans_presets.java:1750 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1801
+#: build/trans_presets.java:1824 build/trans_presets.java:1843
+#: build/trans_presets.java:1860 build/trans_presets.java:1879
+#: build/trans_presets.java:1898 build/trans_presets.java:1914
+#: build/trans_presets.java:1931
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1601 build/trans_presets.java:1619
-#: build/trans_presets.java:1635 build/trans_presets.java:1652
-#: build/trans_presets.java:1670 build/trans_presets.java:1687
-#: build/trans_presets.java:1703 build/trans_presets.java:1720
-#: build/trans_presets.java:1743 build/trans_presets.java:1762
-#: build/trans_presets.java:1779 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1832
-#: build/trans_presets.java:1849 build/trans_presets.java:1864
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1716 build/trans_presets.java:1733
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1802
+#: build/trans_presets.java:1825 build/trans_presets.java:1844
+#: build/trans_presets.java:1861 build/trans_presets.java:1880
+#: build/trans_presets.java:1899 build/trans_presets.java:1915
+#: build/trans_presets.java:1932 build/trans_presets.java:1947
 msgid "isolated"
 msgstr ""
 
-#. <space />
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:1604 build/trans_presets.java:1622
-#: build/trans_presets.java:1638 build/trans_presets.java:1655
-#: build/trans_presets.java:1673 build/trans_presets.java:1690
-#: build/trans_presets.java:1706 build/trans_presets.java:1723
-#: build/trans_presets.java:1746 build/trans_presets.java:1765
-#: build/trans_presets.java:1782 build/trans_presets.java:1800
-#: build/trans_presets.java:1819 build/trans_presets.java:1835
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:3016
-msgid "Phone Number"
-msgstr "電話號碼"
-
-#. item "Travel/Accomodation/Hotel" text "Phone Number"
-#. item "Travel/Accomodation/Motel" text "Phone Number"
-#. item "Travel/Accomodation/Guest House" text "Phone Number"
-#. item "Travel/Accomodation/Chalet" text "Phone Number"
-#. item "Travel/Accomodation/Hostel" text "Phone Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
-#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
-#. item "Travel/Accomodation/Camping Site" text "Phone Number"
-#. item "Food+Drinks/Restaurant" text "Phone Number"
-#. item "Food+Drinks/Fast Food" text "Phone Number"
-#. item "Food+Drinks/Food Court" text "Phone Number"
-#. item "Food+Drinks/Cafe" text "Phone Number"
-#. item "Food+Drinks/Pub" text "Phone Number"
-#. item "Food+Drinks/Biergarten" text "Phone Number"
-#. item "Food+Drinks/Bar" text "Phone Number"
-#. item "Food+Drinks/Nightclub" text "Phone Number"
-#: build/trans_presets.java:1605 build/trans_presets.java:1623
-#: build/trans_presets.java:1639 build/trans_presets.java:1656
-#: build/trans_presets.java:1674 build/trans_presets.java:1691
-#: build/trans_presets.java:1707 build/trans_presets.java:1724
-#: build/trans_presets.java:1747 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1801
-#: build/trans_presets.java:1820 build/trans_presets.java:1836
-#: build/trans_presets.java:1853 build/trans_presets.java:1868
-msgid "Fax Number"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Fax Number"
-#. item "Travel/Accomodation/Motel" text "Fax Number"
-#. item "Travel/Accomodation/Guest House" text "Fax Number"
-#. item "Travel/Accomodation/Chalet" text "Fax Number"
-#. item "Travel/Accomodation/Hostel" text "Fax Number"
-#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
-#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
-#. item "Travel/Accomodation/Camping Site" text "Fax Number"
-#. item "Food+Drinks/Restaurant" text "Fax Number"
-#. item "Food+Drinks/Fast Food" text "Fax Number"
-#. item "Food+Drinks/Food Court" text "Fax Number"
-#. item "Food+Drinks/Cafe" text "Fax Number"
-#. item "Food+Drinks/Pub" text "Fax Number"
-#. item "Food+Drinks/Biergarten" text "Fax Number"
-#. item "Food+Drinks/Bar" text "Fax Number"
-#. item "Food+Drinks/Nightclub" text "Fax Number"
-#: build/trans_presets.java:1606 build/trans_presets.java:1624
-#: build/trans_presets.java:1640 build/trans_presets.java:1657
-#: build/trans_presets.java:1675 build/trans_presets.java:1692
-#: build/trans_presets.java:1708 build/trans_presets.java:1725
-#: build/trans_presets.java:1748 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1802
-#: build/trans_presets.java:1821 build/trans_presets.java:1837
-#: build/trans_presets.java:1854 build/trans_presets.java:1869
-msgid "Website"
-msgstr ""
-
-#. item "Travel/Accomodation/Hotel" text "Website"
-#. item "Travel/Accomodation/Motel" text "Website"
-#. item "Travel/Accomodation/Guest House" text "Website"
-#. item "Travel/Accomodation/Chalet" text "Website"
-#. item "Travel/Accomodation/Hostel" text "Website"
-#. item "Travel/Accomodation/Alpine Hut" text "Website"
-#. item "Travel/Accomodation/Caravan Site" text "Website"
-#. item "Travel/Accomodation/Camping Site" text "Website"
-#. item "Food+Drinks/Restaurant" text "Website"
-#. item "Food+Drinks/Fast Food" text "Website"
-#. item "Food+Drinks/Food Court" text "Website"
-#. item "Food+Drinks/Cafe" text "Website"
-#. item "Food+Drinks/Pub" text "Website"
-#. item "Food+Drinks/Biergarten" text "Website"
-#. item "Food+Drinks/Bar" text "Website"
-#. item "Food+Drinks/Nightclub" text "Website"
-#: build/trans_presets.java:1607 build/trans_presets.java:1625
-#: build/trans_presets.java:1641 build/trans_presets.java:1658
-#: build/trans_presets.java:1676 build/trans_presets.java:1693
-#: build/trans_presets.java:1709 build/trans_presets.java:1726
-#: build/trans_presets.java:1749 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1803
-#: build/trans_presets.java:1822 build/trans_presets.java:1838
-#: build/trans_presets.java:1855 build/trans_presets.java:1870
-msgid "Email Address"
-msgstr ""
-
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1690
 msgid "Motel"
 msgstr "汽車旅館"
@@ -25613,20 +26126,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1692
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1708
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1709
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1724
 msgid "Chalet"
 msgstr "小木屋"
@@ -25634,10 +26147,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1726
 msgid "Edit Chalet"
 msgstr "編輯小木屋"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1741
 msgid "Hostel"
 msgstr "招待所"
@@ -25645,30 +26158,31 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1743
 msgid "Edit Hostel"
 msgstr "編輯招待所"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1759
 msgid "Alpine Hut"
 msgstr "高山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1760
 msgid "Edit Alpine Hut"
 msgstr "編輯高山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
-#: build/trans_presets.java:1695
+#. <separator/>
+#: build/trans_presets.java:1777
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1778
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1793
 msgid "Camping Site"
 msgstr "露營區"
@@ -25676,10 +26190,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1795
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1811
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -25690,5 +26204,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1730 build/trans_surveyor.java:47
+#: build/trans_presets.java:1812 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -25696,5 +26210,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1814
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
@@ -25702,5 +26216,7 @@
 #. item "Food+Drinks/Restaurant" text "Operator"
 #. item "Food+Drinks/Fast Food" text "Operator"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#. item "Food+Drinks/Cafe" text "Operator"
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1875
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -25708,79 +26224,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "italian"
 msgstr "義式料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "chinese"
 msgstr "中式料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "greek"
 msgstr "希臘料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "german"
 msgstr "德式料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "kebab"
 msgstr "烤肉串"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "thai"
 msgstr "泰式料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "japanese"
 msgstr "日本料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "french"
 msgstr "法式料理"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sandwich"
 msgstr "三明治"
 
-#: build/trans_presets.java:1736 build/trans_presets.java:1757
+#: build/trans_presets.java:1818 build/trans_presets.java:1839
 msgid "sushi"
 msgstr "壽司"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1737 build/trans_presets.java:1811
+#: build/trans_presets.java:1819 build/trans_presets.java:1894
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1833
 msgid "Fast Food"
 msgstr "速食"
@@ -25788,18 +26304,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1835
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1839
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1852
 msgid "Food Court"
 msgstr ""
@@ -25807,10 +26323,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1772
+#: build/trans_presets.java:1854
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1869
 msgid "Cafe"
 msgstr "咖啡"
@@ -25818,10 +26334,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1871
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
+#. item "Food+Drinks/Cafe" combo "Cuisine"
+#: build/trans_presets.java:1875
+msgid "ice_cream"
+msgstr ""
+
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1888
 msgid "Pub"
 msgstr "酒店"
@@ -25829,20 +26350,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1890
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1907
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1908
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1923
 msgid "Bar"
 msgstr "酒吧"
@@ -25850,10 +26371,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1925
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1940
 msgid "Nightclub"
 msgstr "夜店"
@@ -25861,25 +26382,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1942
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1956
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1957
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1958
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1963
 msgid "Museum"
 msgstr "博物館"
@@ -25887,9 +26408,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1965
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1970
 msgid "Zoo"
 msgstr "動物園"
@@ -25898,9 +26419,30 @@
 #. <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:1890
+#: build/trans_presets.java:1973
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1978
+msgid "Theme Park"
+msgstr "主題樂園"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1979
+msgid "Edit Theme Park"
+msgstr "編輯主題樂園"
+
+#: build/trans_presets.java:1984
+msgid "Artwork"
+msgstr "藝術工作"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1986
+msgid "Edit Artwork"
+msgstr "編輯藝術工作"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1991
 msgid "Viewpoint"
 msgstr "景點"
@@ -25908,50 +26450,51 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1993
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1996
 msgid "Look-Out Tower"
 msgstr ""
 
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1902
-msgid "Theme Park"
-msgstr "主題樂園"
-
-#. item "Tourism/Theme Park"
-#: build/trans_presets.java:1903
-msgid "Edit Theme Park"
-msgstr "編輯主題樂園"
-
-#: build/trans_presets.java:1908
-msgid "Artwork"
-msgstr "藝術工作"
-
-#. item "Tourism/Artwork"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1910
-msgid "Edit Artwork"
-msgstr "編輯藝術工作"
-
-#. item "Tourism/Artwork" text "Name"
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1999
+msgid "Edit Shelter"
+msgstr "編輯涼亭"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+msgid "Fireplace"
+msgstr "壁爐"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:2004
+msgid "Picnic Site"
+msgstr "野餐區"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:2005
+msgid "Edit Picnic Site"
+msgstr "編輯野餐區"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2011
 msgid "Information Office"
 msgstr "資訊服務處"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2018
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "topo"
 msgstr ""
@@ -25989,5 +26532,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1927 build/trans_style.java:625
+#: build/trans_presets.java:2023 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25995,28 +26538,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:2023
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "Shown Area"
 msgstr "顯示區域"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2024
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1929 build/trans_presets.java:1945
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2025 build/trans_presets.java:2041
+#: build/trans_presets.java:2089
 msgid "Closer Description"
 msgstr ""
@@ -26026,5 +26569,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1931 build/trans_presets.java:1954
+#: build/trans_presets.java:2027 build/trans_presets.java:2050
 msgid "Routes shown for:"
 msgstr ""
@@ -26032,5 +26575,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1932 build/trans_presets.java:1955
+#: build/trans_presets.java:2028 build/trans_presets.java:2051
 msgid "Hiking"
 msgstr "健走"
@@ -26038,6 +26581,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1933 build/trans_presets.java:1956
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2029 build/trans_presets.java:2052
+#: build/trans_presets.java:2261
 msgid "Cycling"
 msgstr "自行車"
@@ -26045,5 +26588,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
+#: build/trans_presets.java:2030 build/trans_presets.java:2053
 msgid "Mountainbiking"
 msgstr ""
@@ -26051,6 +26594,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1935 build/trans_presets.java:1958
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2031 build/trans_presets.java:2054
+#: build/trans_presets.java:2309
 msgid "Skiing"
 msgstr "滑雪"
@@ -26058,5 +26601,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1936 build/trans_presets.java:1959
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Riding"
 msgstr ""
@@ -26064,46 +26607,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1937 build/trans_presets.java:1960
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "... other transportation modes possible"
 msgstr "... 其他可能的運輸模式"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2035
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2040
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2043
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2058
 msgid "Flagpole"
 msgstr ""
@@ -26112,5 +26655,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2062
 msgid "Information Terminal"
 msgstr ""
@@ -26118,55 +26661,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1971 build/trans_presets.java:1981
+#: build/trans_presets.java:2067 build/trans_presets.java:2077
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2072
 msgid "Audioguide"
 msgstr "語音導覽"
 
 #. <space />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2082
 msgid "Audioguide via mobile phone?"
 msgstr "是否透過行動電話使用語音導覽？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2083
 msgid "Phone number"
 msgstr "電話號碼"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2085
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
-#. item "Tourism/Shelter"
-#: build/trans_presets.java:1997
-msgid "Edit Shelter"
-msgstr "編輯涼亭"
-
-#. item "Tourism/Shelter" text "Name"
-#. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2000 build/trans_presets.java:2006
-msgid "Fireplace"
-msgstr "壁爐"
-
-#. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2002
-msgid "Picnic Site"
-msgstr "野餐區"
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2003
-msgid "Edit Picnic Site"
-msgstr "編輯野餐區"
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:2009
+#. item "Tourism/Other Information Points" text "Closer Description"
+#: build/trans_presets.java:2092
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2093
 msgid "Castle"
 msgstr "城堡"
@@ -26175,19 +26697,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:2013
+#: build/trans_presets.java:2096
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2100
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2101
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2106
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -26196,9 +26718,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:2026
+#: build/trans_presets.java:2109
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2114
 msgid "Battlefield"
 msgstr "戰場"
@@ -26206,10 +26728,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2116
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2120
 msgid "Palaeontological Site"
 msgstr ""
@@ -26217,5 +26739,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2122
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26223,15 +26745,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2127
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2128
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2132
 msgid "Memorial"
 msgstr "紀念碑"
@@ -26239,55 +26761,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2134
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2138
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2139
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2143
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2148
 msgid "Boundary Stone"
 msgstr "邊界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2149
 msgid "Edit Boundary Stone"
 msgstr "編輯邊界石"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2154
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2155
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2156
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2160
 msgid "Playground"
 msgstr "運動場"
@@ -26295,35 +26817,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2162
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2166
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2167
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2090 build/trans_presets.java:2926
+#: build/trans_presets.java:2173 build/trans_presets.java:2918
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2174
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2175
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2176
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -26337,6 +26859,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2097 build/trans_presets.java:2106
-#: build/trans_presets.java:2115 build/trans_presets.java:2124
+#: build/trans_presets.java:2180 build/trans_presets.java:2189
+#: build/trans_presets.java:2198 build/trans_presets.java:2207
 msgid "select sport:"
 msgstr "選擇運動："
@@ -26752,6 +27274,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26786,240 +27308,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "american_football"
 msgstr "美式足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canadian_football"
 msgstr "加拿大足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:2099 build/trans_presets.java:2108
-#: build/trans_presets.java:2117 build/trans_presets.java:2126
+#: build/trans_presets.java:2182 build/trans_presets.java:2191
+#: build/trans_presets.java:2200 build/trans_presets.java:2209
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2184
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2185
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2193
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2194
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2202
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2203
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2211
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2212
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2217
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2218
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2224
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2225
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2226
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -27036,5 +27558,4 @@
 #. item "Sport/Horse Racing" text "Name"
 #. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
 #. item "Sport/Skating" text "Name"
 #. item "Sport/Skateboard" text "Name"
@@ -27061,23 +27582,31 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" text "Name"
+#. item "Motorsport/Karting" text "Name"
+#. item "Motorsport/Motocross" text "Name"
+#. item "Motorsport/Safety Training" text "Name"
+#. item "Motorsport/Model Aerodrome" text "Name"
+#. item "Motorsport/RC Car" text "Name"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "type"
 msgstr "類型"
@@ -27094,5 +27623,4 @@
 #. item "Sport/Horse Racing" combo "type"
 #. item "Sport/Gymnastics" combo "type"
-#. item "Sport/Motor Sports" combo "type"
 #. item "Sport/Skating" combo "type"
 #. item "Sport/Skateboard" combo "type"
@@ -27119,211 +27647,214 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#. item "Motorsport/Motorsport" combo "type"
+#. item "Motorsport/Karting" combo "type"
+#. item "Motorsport/Motocross" combo "type"
+#. item "Motorsport/Safety Training" combo "type"
+#. item "Motorsport/Model Aerodrome" combo "type"
+#. item "Motorsport/RC Car" combo "type"
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182 build/trans_presets.java:2188
-#: build/trans_presets.java:2194 build/trans_presets.java:2200
-#: build/trans_presets.java:2206 build/trans_presets.java:2212
-#: build/trans_presets.java:2218 build/trans_presets.java:2224
-#: build/trans_presets.java:2230 build/trans_presets.java:2239
-#: build/trans_presets.java:2246 build/trans_presets.java:2254
-#: build/trans_presets.java:2260 build/trans_presets.java:2266
-#: build/trans_presets.java:2272 build/trans_presets.java:2278
-#: build/trans_presets.java:2284 build/trans_presets.java:2290
-#: build/trans_presets.java:2296 build/trans_presets.java:2302
-#: build/trans_presets.java:2308 build/trans_presets.java:2314
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229 build/trans_presets.java:2235
+#: build/trans_presets.java:2241 build/trans_presets.java:2247
+#: build/trans_presets.java:2253 build/trans_presets.java:2259
+#: build/trans_presets.java:2265 build/trans_presets.java:2271
+#: build/trans_presets.java:2277 build/trans_presets.java:2283
+#: build/trans_presets.java:2289 build/trans_presets.java:2295
+#: build/trans_presets.java:2301 build/trans_presets.java:2307
+#: build/trans_presets.java:2316 build/trans_presets.java:2323
+#: build/trans_presets.java:2331 build/trans_presets.java:2337
+#: build/trans_presets.java:2343 build/trans_presets.java:2349
+#: build/trans_presets.java:2355 build/trans_presets.java:2361
+#: build/trans_presets.java:2367 build/trans_presets.java:2373
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2415 build/trans_presets.java:2421
+#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:2439 build/trans_presets.java:2445
+#: build/trans_presets.java:2453 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2478 build/trans_presets.java:2484
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2231
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2232
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2237
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2238
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2243
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2244
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2249
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2250
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2255
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2256
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2262
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2267
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2268
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2273
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2274
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2279
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2280
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2285
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2286
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:2208
-msgid "Motor Sports"
-msgstr "摩托車運動"
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2209
-msgid "Edit Motor Sports"
-msgstr "編輯摩托車運動"
-
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2291
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2292
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2297
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2298
 msgid "Edit Skateboard"
 msgstr "編輯滑板"
 
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2303
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2304
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -27331,52 +27862,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2311
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2314
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2315
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2318
 msgid "Shooting"
 msgstr "射擊"
@@ -27384,204 +27915,270 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2320
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2326
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2327
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2328
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2333
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2334
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2339
 msgid "American Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2340
 msgid "Edit American Football"
 msgstr "編輯美式足球"
 
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2345
 msgid "Canadian Football"
 msgstr "加拿大足球"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2346
 msgid "Edit Canadian Football"
 msgstr "編輯加拿大足球"
 
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2351
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2352
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2357
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2358
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2363
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2364
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2369
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2370
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2375
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2376
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2381
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2382
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2385
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2387
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2388
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2393
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2394
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2399
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2400
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2405
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2406
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2411
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2412
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2417
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2418
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2423
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2424
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2429
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2430
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2435
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2436
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2441
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2442
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#: build/trans_presets.java:2372
+#. group "Motorsport"
+#: build/trans_presets.java:2448 build/trans_presets.java:2449
+#, fuzzy
+msgid "Motorsport"
+msgstr "摩托車運動"
+
+#. item "Motorsport/Motorsport"
+#: build/trans_presets.java:2450
+#, fuzzy
+msgid "Edit Motorsport"
+msgstr "編輯摩托車運動"
+
+#: build/trans_presets.java:2455
+#, fuzzy
+msgid "Karting"
+msgstr "警告"
+
+#. item "Motorsport/Karting"
+#: build/trans_presets.java:2456
+#, fuzzy
+msgid "Edit Karting"
+msgstr "編輯停車場"
+
+#: build/trans_presets.java:2461
+#, fuzzy
+msgid "Motocross"
+msgstr "汽車"
+
+#. item "Motorsport/Motocross"
+#: build/trans_presets.java:2462
+#, fuzzy
+msgid "Edit Motocross"
+msgstr "編輯摩托車運動"
+
+#: build/trans_presets.java:2467
+msgid "Safety Training"
+msgstr ""
+
+#. item "Motorsport/Safety Training"
+#: build/trans_presets.java:2468
+#, fuzzy
+msgid "Edit Safety Training"
+msgstr "編輯溜冰"
+
+#. <separator/>
+#: build/trans_presets.java:2474
+msgid "Model Aerodrome"
+msgstr ""
+
+#. item "Motorsport/Model Aerodrome"
+#: build/trans_presets.java:2475
+#, fuzzy
+msgid "Edit Model Aerodrome"
+msgstr "編輯國境管控站"
+
+#: build/trans_presets.java:2480
+#, fuzzy
+msgid "RC Car"
+msgstr "汽車"
+
+#. item "Motorsport/RC Car"
+#: build/trans_presets.java:2481
+#, fuzzy
+msgid "Edit RC Car"
+msgstr "編輯大型纜車"
+
+#: build/trans_presets.java:2488
 msgid "Man-Made"
 msgstr "人造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2490
 msgid "Building"
 msgstr "建築物"
@@ -27589,5 +28186,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2493
 msgid "Public Building"
 msgstr "公共建築"
@@ -27595,10 +28192,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2495
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2499
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -27606,10 +28203,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2501
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2505
 msgid "Embassy"
 msgstr "大使館"
@@ -27617,10 +28214,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2507
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2511
 msgid "Courthouse"
 msgstr "法院"
@@ -27629,10 +28226,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:2398
+#: build/trans_presets.java:2514
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2518
 msgid "Prison"
 msgstr "監獄"
@@ -27641,10 +28238,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:2405
+#: build/trans_presets.java:2521
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2525
 msgid "Police"
 msgstr "警察局"
@@ -27654,10 +28251,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:2413
+#: build/trans_presets.java:2529
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2533
 msgid "Fire Station"
 msgstr "消防隊"
@@ -27666,10 +28263,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:2420
+#: build/trans_presets.java:2536
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2540
 msgid "Post Office"
 msgstr "郵局"
@@ -27677,5 +28274,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2542
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -27683,15 +28280,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2548
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2549
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2553
 msgid "School"
 msgstr "學校"
@@ -27699,10 +28296,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2555
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2559
 msgid "University"
 msgstr "大學"
@@ -27710,10 +28307,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2561
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2565
 msgid "College"
 msgstr "學院"
@@ -27721,5 +28318,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2567
 msgid "Edit College"
 msgstr "編輯學院"
@@ -27727,5 +28324,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2572
 msgid "Cinema"
 msgstr "電影院"
@@ -27734,10 +28331,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:2459
+#: build/trans_presets.java:2575
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2579
 msgid "Library"
 msgstr "圖書館"
@@ -27746,9 +28343,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:2466
+#: build/trans_presets.java:2582
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2587
 msgid "Arts Centre"
 msgstr "美術館"
@@ -27756,10 +28353,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2589
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2593
 msgid "Theatre"
 msgstr "劇院"
@@ -27768,10 +28365,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:2480
+#: build/trans_presets.java:2596
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2600
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -27781,5 +28378,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:2488
+#: build/trans_presets.java:2604
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -27788,6 +28385,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "Religion"
 msgstr "宗教"
@@ -27796,66 +28393,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2491 build/trans_presets.java:3316
-#: build/trans_presets.java:3325
+#: build/trans_presets.java:2607 build/trans_presets.java:3416
+#: build/trans_presets.java:3425
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "Denomination"
 msgstr "教派"
@@ -27864,189 +28461,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2492 build/trans_presets.java:3317
-#: build/trans_presets.java:3326
+#: build/trans_presets.java:2608 build/trans_presets.java:3417
+#: build/trans_presets.java:3426
 msgid "sunni"
 msgstr "遜尼派"
 
-#. <separator/>
-#: build/trans_presets.java:2496
-msgid "Addresses"
-msgstr "地址"
-
-#. item "Man-Made/Buildings/Addresses"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2499
-msgid "Edit Address Information"
-msgstr "編輯地址資訊"
-
-#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
-#. <space />
-#: build/trans_presets.java:2501
-msgid "House number"
-msgstr "門牌號碼"
-
-#. item "Man-Made/Buildings/Addresses" text "House number"
-#. <optional>
-#: build/trans_presets.java:2503
-msgid "House name"
-msgstr "房屋名稱"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2504
-msgid "Street name"
-msgstr "街道名稱"
-
-#. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2505
-msgid "City name"
-msgstr "城市名稱"
-
-#. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2506
-msgid "Post code"
-msgstr "郵遞區號"
-
-#. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2507
-msgid "Country code"
-msgstr "國碼"
-
-#. item "Man-Made/Buildings/Address Interpolation"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
-#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2513
-msgid "Edit Address Interpolation"
-msgstr "編輯地址填寫"
-
-#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
-#. <space />
-#: build/trans_presets.java:2515
-msgid "Numbering scheme"
-msgstr "編號規則"
-
-#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2515
-msgid "odd"
-msgstr "奇數"
-
-#: build/trans_presets.java:2515
-msgid "even"
-msgstr "偶數"
-
-#: build/trans_presets.java:2515
-msgid "alphabetic"
-msgstr "按字母順序"
-
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2612
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2613
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2614
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2618
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2619
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "Tower type"
 msgstr "塔類型"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "communication"
 msgstr "通訊"
 
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2622
 msgid "observation"
 msgstr "觀測"
 
 #. <optional>
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2624
 msgid "Height (meters)"
 msgstr "高度（米）"
@@ -28054,25 +28581,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2628
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2629
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2633
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2634
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2638
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -28080,10 +28607,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2640
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2644
 msgid "Windmill"
 msgstr "風車"
@@ -28091,10 +28618,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2646
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2650
 msgid "Pipeline"
 msgstr "油管"
@@ -28103,41 +28630,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2653
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
-#: build/trans_presets.java:2562 build/trans_presets.java:2605
+#: build/trans_presets.java:2656 build/trans_presets.java:2699
 msgid "gas"
 msgstr "天然氣"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2656
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "Location"
 msgstr "位置"
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2657
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2659
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -28147,10 +28674,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:2569
+#: build/trans_presets.java:2663
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2667
 msgid "Crane"
 msgstr "起重機"
@@ -28158,5 +28685,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2669
 msgid "Edit Crane"
 msgstr "編輯起重機"
@@ -28164,10 +28691,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2675
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2679
 msgid "Survey Point"
 msgstr "測量點"
@@ -28175,10 +28702,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2681
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2685
 msgid "Surveillance"
 msgstr "監視"
@@ -28186,23 +28713,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2687
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "outdoor"
 msgstr "戶外"
 
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2690
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2693
 msgid "Power Generator"
 msgstr "發電廠"
@@ -28212,35 +28739,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:2603
+#: build/trans_presets.java:2697
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2699
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2702
 msgid "Power Station"
 msgstr "發電廠"
@@ -28249,10 +28776,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:2611
+#: build/trans_presets.java:2705
 msgid "Edit Power Station"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2711
 msgid "Power Sub Station"
 msgstr ""
@@ -28261,5 +28788,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:2620
+#: build/trans_presets.java:2714
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -28267,10 +28794,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2623 build/trans_presets.java:2640
+#: build/trans_presets.java:2717 build/trans_presets.java:2734
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2719
 msgid "Power Tower"
 msgstr "電塔"
@@ -28281,23 +28808,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:2630
+#: build/trans_presets.java:2724
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2725
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2726
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2728
 msgid "Power Line"
 msgstr "電線"
@@ -28306,20 +28833,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2731
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2732
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28327,55 +28854,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2737
 msgid "Amount of Cables"
 msgstr "纜線數量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 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:2644
+#: build/trans_presets.java:2738
 msgid "single"
 msgstr "單線"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "double"
 msgstr "雙線"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "triple"
 msgstr "三線"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2738
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2741
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2742
 msgid "Toilets"
 msgstr "廁所"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2749
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2656 build/trans_presets.java:2946
+#: build/trans_presets.java:2750 build/trans_presets.java:3036
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2752
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2757
 msgid "Telephone"
 msgstr "電話"
@@ -28384,5 +28911,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:2666
+#: build/trans_presets.java:2760
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -28390,5 +28917,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2669 build/trans_presets.java:2947
+#: build/trans_presets.java:2763 build/trans_presets.java:3037
 msgid "Coins"
 msgstr "硬幣"
@@ -28396,5 +28923,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2670 build/trans_presets.java:2948
+#: build/trans_presets.java:2764 build/trans_presets.java:3038
 msgid "Notes"
 msgstr ""
@@ -28402,5 +28929,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2671 build/trans_presets.java:2949
+#: build/trans_presets.java:2765 build/trans_presets.java:3039
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -28408,5 +28935,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2672 build/trans_presets.java:2950
+#: build/trans_presets.java:2766 build/trans_presets.java:3040
 msgid "Debit cards"
 msgstr ""
@@ -28414,15 +28941,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2673 build/trans_presets.java:2951
+#: build/trans_presets.java:2767 build/trans_presets.java:3041
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2768
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2770
 msgid "Recycling"
 msgstr "資源回收"
@@ -28431,5 +28958,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:2679
+#: build/trans_presets.java:2773
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -28437,35 +28964,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2775
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2776
 msgid "Cans"
 msgstr "瓶罐"
 
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2683
-msgid "Clothes"
-msgstr "衣服"
-
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2778
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2779
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2780
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2782
 msgid "Waste Basket"
 msgstr ""
@@ -28473,5 +28995,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2784
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28480,31 +29002,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2790
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "Material"
 msgstr "材質"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "stone"
 msgstr "石頭"
 
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2791
 msgid "plastic"
 msgstr "塑膠"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "Colour"
 msgstr "顏色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "brown"
 msgstr "淺褐色"
@@ -28583,5 +29105,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2698 build/trans_style.java:3198
+#: build/trans_presets.java:2792 build/trans_style.java:3198
 #: build/trans_style.java:3206 build/trans_style.java:3214
 #: build/trans_style.java:3222 build/trans_style.java:3230
@@ -28591,31 +29113,31 @@
 msgstr "綠色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "red"
 msgstr "紅色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "blue"
 msgstr "藍色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2792
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2793
 msgid "Amount of Seats"
 msgstr "座椅數量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2795
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2796
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28623,31 +29145,31 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2704 build/trans_presets.java:3186
+#. item "Nature/Tree" text "Type"
+#: build/trans_presets.java:2798 build/trans_presets.java:3285
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2798
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2800
 msgid "Hide"
 msgstr "隱藏"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2801
 msgid "Lock"
 msgstr "鎖"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2803
 msgid "Fountain"
 msgstr "噴泉"
@@ -28656,10 +29178,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:2712
+#: build/trans_presets.java:2806
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2810
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -28668,10 +29190,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2813
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2817
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -28680,5 +29202,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2820
 msgid "Edit Fire Hydrant"
 msgstr "編輯消防栓"
@@ -28686,501 +29208,503 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2824
+#, fuzzy
+msgid "Food"
+msgstr "步行"
+
+#. group "Food"
+#: build/trans_presets.java:2825
+msgid "Supermarket"
+msgstr "超級市場"
+
+#. item "Food/Supermarket"
+#: build/trans_presets.java:2826
+msgid "Edit Supermarket"
+msgstr "編輯超級市場"
+
+#: build/trans_presets.java:2831
+msgid "Convenience Store"
+msgstr "便利商店"
+
+#. item "Food/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2833
+msgid "Edit Convenience Store"
+msgstr "編輯便利商店"
+
+#: build/trans_presets.java:2838
+msgid "Kiosk"
+msgstr ""
+
+#. item "Food/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2840
+msgid "Edit Kiosk"
+msgstr ""
+
+#: build/trans_presets.java:2845
+msgid "Butcher"
+msgstr "肉類"
+
+#. item "Food/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2847
+msgid "Edit Butcher"
+msgstr "編輯肉店"
+
+#: build/trans_presets.java:2852
+msgid "Baker"
+msgstr "麵包類"
+
+#. item "Food/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2854
+msgid "Edit Baker"
+msgstr "編輯麵包店"
+
+#: build/trans_presets.java:2859
+msgid "Organic"
+msgstr "有機產品"
+
+#. item "Food/Organic"
+#: build/trans_presets.java:2860
+msgid "Edit Organic Shop"
+msgstr "編輯有機產品商店"
+
+#: build/trans_presets.java:2865
+msgid "Alcohol"
+msgstr "酒類"
+
+#. item "Food/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2867
+msgid "Edit Alcohol Shop"
+msgstr "編輯賣酒的商店"
+
+#: build/trans_presets.java:2872
+msgid "Beverages"
+msgstr "飲料類"
+
+#. item "Food/Beverages"
+#: build/trans_presets.java:2873
+msgid "Edit Beverages Shop"
+msgstr "編輯飲料店"
+
+#: build/trans_presets.java:2879
+msgid "Shops"
+msgstr "商店"
+
+#. group "Shops"
+#: build/trans_presets.java:2880
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2881
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2886
+msgid "Hairdresser"
+msgstr "美髮類"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2887
+msgid "Edit Hairdresser"
+msgstr "編輯美髮店"
+
+#: build/trans_presets.java:2892
+msgid "Optician"
+msgstr "眼鏡類"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2893
+msgid "Edit Optician"
+msgstr "編輯眼鏡行"
+
+#. item "Shops/Clothes"
+#: build/trans_presets.java:2900
+#, fuzzy
+msgid "Edit Clothes Shop"
+msgstr "編輯電腦商店"
+
+#: build/trans_presets.java:2905
+msgid "Shoes"
+msgstr "鞋類"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2906
+msgid "Edit Shoe Shop"
+msgstr "編輯鞋店"
+
+#: build/trans_presets.java:2911
+msgid "Outdoor"
+msgstr "戶外用品"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2913
+msgid "Edit Outdoor Shop"
+msgstr "編輯戶外用品店"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2919
+msgid "Edit Sports Shop"
+msgstr "編輯運動用品店"
+
+#: build/trans_presets.java:2924
+msgid "Dry Cleaning"
+msgstr "乾洗類"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2926
+msgid "Edit Dry Cleaning"
+msgstr "編輯乾洗店"
+
+#: build/trans_presets.java:2931
+msgid "Laundry"
+msgstr "洗衣店"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2933
+msgid "Edit Laundry"
+msgstr "編輯洗衣店"
+
+#: build/trans_presets.java:2938
+#, fuzzy
+msgid "Tailor"
+msgstr "軌"
+
+#. item "Shops/Tailor"
+#: build/trans_presets.java:2939
+#, fuzzy
+msgid "Edit Tailor"
+msgstr "編輯軌道"
+
+#. <separator/>
+#: build/trans_presets.java:2945
+msgid "Computer"
+msgstr "電腦類"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2946
+msgid "Edit Computer Shop"
+msgstr "編輯電腦商店"
+
+#: build/trans_presets.java:2951
+msgid "Electronics"
+msgstr "電子材料"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2952
+msgid "Edit Electronics Shop"
+msgstr "編輯電子材料行"
+
+#: build/trans_presets.java:2957
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2958
+msgid "Edit Hifi Shop"
+msgstr "編輯 Hifi 音響店"
+
+#: build/trans_presets.java:2963
+msgid "Video"
+msgstr "影片類"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2964
+msgid "Edit Video Shop"
+msgstr "編輯影片類商店"
+
+#. <separator/>
+#: build/trans_presets.java:2970
+msgid "Florist"
+msgstr "花類"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2972
+msgid "Edit Florist"
+msgstr "編輯花店"
+
+#: build/trans_presets.java:2977
+msgid "Garden Centre"
+msgstr "園藝中心"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2979
+msgid "Edit Garden Centre"
+msgstr "編輯園藝中心"
+
+#: build/trans_presets.java:2984
+msgid "Hardware"
+msgstr "硬體"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2986
+msgid "Edit Hardware Store"
+msgstr "編輯硬體商店"
+
+#: build/trans_presets.java:2991
+msgid "Do-it-yourself-store"
+msgstr "DIY 商店"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2993
+msgid "Edit Do-it-yourself-store"
+msgstr "編輯 DIY 商店"
+
+#: build/trans_presets.java:2998
+msgid "Furniture"
+msgstr "傢俱類"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2999
+msgid "Edit Furniture Shop"
+msgstr "編輯傢俱店"
+
+#: build/trans_presets.java:3004
+msgid "Stationery"
+msgstr "文具類"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:3005
+msgid "Edit Stationery Shop"
+msgstr "編輯文具店"
+
+#: build/trans_presets.java:3010
+msgid "Book Store"
+msgstr "書店"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:3011
+msgid "Edit Book Store"
+msgstr "編輯書店"
+
+#: build/trans_presets.java:3016
+msgid "Travel Agency"
+msgstr "旅行社"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:3017
+msgid "Edit Travel Agency"
+msgstr "編輯旅行社"
+
+#: build/trans_presets.java:3022
+msgid "Toys"
+msgstr "玩具類"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:3023
+msgid "Edit Toy Shop"
+msgstr "編輯玩具店"
+
+#. <separator/>
+#: build/trans_presets.java:3029
+msgid "Vending machine"
+msgstr "自動販賣機"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:3031
+msgid "Edit Vending machine"
+msgstr "編輯自動販賣機"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:3033
+msgid "Vending products"
+msgstr "販賣產品"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:3033
+msgid "public_transport_tickets"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "public_transport_plans"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "parking_tickets"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "food"
+msgstr "食物"
+
+#: build/trans_presets.java:3033
+msgid "drinks"
+msgstr "飲料"
+
+#: build/trans_presets.java:3033
+msgid "sweets"
+msgstr "甜點"
+
+#: build/trans_presets.java:3033
+msgid "cigarettes"
+msgstr "菸"
+
+#: build/trans_presets.java:3033
+msgid "photos"
+msgstr "相片"
+
+#: build/trans_presets.java:3033
+msgid "animal_food"
+msgstr "飼料"
+
+#: build/trans_presets.java:3033
+msgid "news_papers"
+msgstr "報紙"
+
+#: build/trans_presets.java:3033
+msgid "toys"
+msgstr "玩具"
+
+#: build/trans_presets.java:3033
+msgid "stamps"
+msgstr "郵票"
+
+#: build/trans_presets.java:3033
+msgid "SIM-cards"
+msgstr "SIM-卡"
+
+#: build/trans_presets.java:3033
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "vouchers"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "condoms"
+msgstr "保險套"
+
+#: build/trans_presets.java:3033
+msgid "tampons"
+msgstr ""
+
+#: build/trans_presets.java:3033
+msgid "excrement_bags"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:3042
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:3045
+msgid "Cash"
+msgstr "現金"
+
+#. group "Cash"
+#: build/trans_presets.java:3046
+msgid "Bank"
+msgstr "銀行"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:3048
+msgid "Edit Bank"
+msgstr "編輯銀行"
+
+#: build/trans_presets.java:3053 build/trans_presets.java:3062
+msgid "Automated Teller Machine"
+msgstr "自動提款機(ATM)"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:3055
+msgid "Money Exchange"
+msgstr "金錢兌換所"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:3057
+msgid "Edit Money Exchange"
+msgstr "編輯金錢兌換所"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:3064
+msgid "Edit Automated Teller Machine"
+msgstr "編輯自動提款機"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:3069
+msgid "Health"
+msgstr "健康"
+
+#. group "Health"
+#: build/trans_presets.java:3070
+msgid "Doctors"
+msgstr "醫師"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:3072
+msgid "Edit Doctors"
+msgstr "編輯醫師"
+
+#: build/trans_presets.java:3077
+msgid "Dentist"
+msgstr "牙醫"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:3078
+msgid "Edit Dentist"
+msgstr "編輯牙醫"
+
+#: build/trans_presets.java:3083
+msgid "Pharmacy"
+msgstr "藥局"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:3085
+msgid "Edit Pharmacy"
+msgstr "編輯藥局"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:3087
+msgid "Dispensing"
+msgstr "配藥"
+
+#: build/trans_presets.java:3091
+msgid "Hospital"
+msgstr "醫院"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:3093
+msgid "Edit Hospital"
+msgstr "編輯醫院"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:3097
 msgid "Baby Hatch"
 msgstr "棄嬰保護艙"
 
-#. item "Amenities/Baby Hatch"
+#. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:3099
 msgid "Edit Baby Hatch"
 msgstr "編輯棄嬰保護艙"
 
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2737
-msgid "Shops"
-msgstr "商店"
-
-#. group "Shops"
-#: build/trans_presets.java:2738
-msgid "Car Dealer"
-msgstr "汽車經銷商"
-
-#. item "Shops/Car Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2740
-msgid "Edit Car Shop"
-msgstr "編輯汽車商店"
-
-#. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2745
-msgid "Bike Dealer"
-msgstr "自行車經銷商"
-
-#. item "Shops/Bike Dealer"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2748
-msgid "Edit Bicycle Shop"
-msgstr "編輯自行車商店"
-
-#. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2752
-msgid "Supermarket"
-msgstr "超級市場"
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2753
-msgid "Edit Supermarket"
-msgstr "編輯超級市場"
-
-#: build/trans_presets.java:2758
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2759
-msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2764
-msgid "Convenience Store"
-msgstr "便利商店"
-
-#. item "Shops/Convenience Store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2766
-msgid "Edit Convenience Store"
-msgstr "編輯便利商店"
-
-#: build/trans_presets.java:2771
-msgid "Kiosk"
-msgstr ""
-
-#. item "Shops/Kiosk"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2773
-msgid "Edit Kiosk"
-msgstr ""
-
-#: build/trans_presets.java:2778
-msgid "Book Store"
-msgstr "書店"
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2779
-msgid "Edit Book Store"
-msgstr "編輯書店"
-
-#: build/trans_presets.java:2784
-msgid "Travel Agency"
-msgstr "旅行社"
-
-#. item "Shops/Travel Agency"
-#: build/trans_presets.java:2785
-msgid "Edit Travel Agency"
-msgstr "編輯旅行社"
-
-#: build/trans_presets.java:2790
-msgid "Butcher"
-msgstr "肉類"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2792
-msgid "Edit Butcher"
-msgstr "編輯肉店"
-
-#: build/trans_presets.java:2797
-msgid "Baker"
-msgstr "麵包類"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2799
-msgid "Edit Baker"
-msgstr "編輯麵包店"
-
-#: build/trans_presets.java:2804
-msgid "Florist"
-msgstr "花類"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2806
-msgid "Edit Florist"
-msgstr "編輯花店"
-
-#: build/trans_presets.java:2811
-msgid "Organic"
-msgstr "有機產品"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2812
-msgid "Edit Organic Shop"
-msgstr "編輯有機產品商店"
-
-#: build/trans_presets.java:2817
-msgid "Alcohol"
-msgstr "酒類"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2819
-msgid "Edit Alcohol Shop"
-msgstr "編輯賣酒的商店"
-
-#: build/trans_presets.java:2824
-msgid "Beverages"
-msgstr "飲料類"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2825
-msgid "Edit Beverages Shop"
-msgstr "編輯飲料店"
-
-#: build/trans_presets.java:2830
-msgid "Computer"
-msgstr "電腦類"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2831
-msgid "Edit Computer Shop"
-msgstr "編輯電腦商店"
-
-#: build/trans_presets.java:2836
-msgid "Electronics"
-msgstr "電子材料"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2837
-msgid "Edit Electronics Shop"
-msgstr "編輯電子材料行"
-
-#: build/trans_presets.java:2842
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2843
-msgid "Edit Hifi Shop"
-msgstr "編輯 Hifi 音響店"
-
-#: build/trans_presets.java:2848
-msgid "Furniture"
-msgstr "傢俱類"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2849
-msgid "Edit Furniture Shop"
-msgstr "編輯傢俱店"
-
-#: build/trans_presets.java:2854
-msgid "Garden Centre"
-msgstr "園藝中心"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2856
-msgid "Edit Garden Centre"
-msgstr "編輯園藝中心"
-
-#: build/trans_presets.java:2861
-msgid "Hardware"
-msgstr "硬體"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2863
-msgid "Edit Hardware Store"
-msgstr "編輯硬體商店"
-
-#: build/trans_presets.java:2868
-msgid "Do-it-yourself-store"
-msgstr "DIY 商店"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2870
-msgid "Edit Do-it-yourself-store"
-msgstr "編輯 DIY 商店"
-
-#: build/trans_presets.java:2875
-msgid "Stationery"
-msgstr "文具類"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2876
-msgid "Edit Stationery Shop"
-msgstr "編輯文具店"
-
-#: build/trans_presets.java:2881
-msgid "Hairdresser"
-msgstr "美髮類"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2882
-msgid "Edit Hairdresser"
-msgstr "編輯美髮店"
-
-#: build/trans_presets.java:2887
-msgid "Shoes"
-msgstr "鞋類"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2888
-msgid "Edit Shoe Shop"
-msgstr "編輯鞋店"
-
-#: build/trans_presets.java:2893
-msgid "Toys"
-msgstr "玩具類"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2894
-msgid "Edit Toy Shop"
-msgstr "編輯玩具店"
-
-#: build/trans_presets.java:2899
-msgid "Video"
-msgstr "影片類"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2900
-msgid "Edit Video Shop"
-msgstr "編輯影片類商店"
-
-#: build/trans_presets.java:2905
-msgid "Dry Cleaning"
-msgstr "乾洗類"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2907
-msgid "Edit Dry Cleaning"
-msgstr "編輯乾洗店"
-
-#: build/trans_presets.java:2912
-msgid "Laundry"
-msgstr "洗衣店"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2914
-msgid "Edit Laundry"
-msgstr "編輯洗衣店"
-
-#: build/trans_presets.java:2919
-msgid "Outdoor"
-msgstr "戶外用品"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2921
-msgid "Edit Outdoor Shop"
-msgstr "編輯戶外用品店"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2927
-msgid "Edit Sports Shop"
-msgstr "編輯運動用品店"
-
-#: build/trans_presets.java:2932
-msgid "Optician"
-msgstr "眼鏡類"
-
-#. item "Shops/Optician"
-#: build/trans_presets.java:2933
-msgid "Edit Optician"
-msgstr "編輯眼鏡行"
-
-#. <separator/>
-#: build/trans_presets.java:2939
-msgid "Vending machine"
-msgstr "自動販賣機"
-
-#. item "Shops/Vending machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2941
-msgid "Edit Vending machine"
-msgstr "編輯自動販賣機"
-
-#. item "Shops/Vending machine" label "Edit Vending machine"
-#. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2943
-msgid "Vending products"
-msgstr "販賣產品"
-
-#. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2943
-msgid "public_transport_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "public_transport_plans"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "parking_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "food"
-msgstr "食物"
-
-#: build/trans_presets.java:2943
-msgid "drinks"
-msgstr "飲料"
-
-#: build/trans_presets.java:2943
-msgid "sweets"
-msgstr "甜點"
-
-#: build/trans_presets.java:2943
-msgid "cigarettes"
-msgstr "菸"
-
-#: build/trans_presets.java:2943
-msgid "photos"
-msgstr "相片"
-
-#: build/trans_presets.java:2943
-msgid "animal_food"
-msgstr "飼料"
-
-#: build/trans_presets.java:2943
-msgid "news_papers"
-msgstr "報紙"
-
-#: build/trans_presets.java:2943
-msgid "toys"
-msgstr "玩具"
-
-#: build/trans_presets.java:2943
-msgid "stamps"
-msgstr "郵票"
-
-#: build/trans_presets.java:2943
-msgid "SIM-cards"
-msgstr "SIM-卡"
-
-#: build/trans_presets.java:2943
-msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "bicycle_tube"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "condoms"
-msgstr "保險套"
-
-#: build/trans_presets.java:2943
-msgid "tampons"
-msgstr ""
-
-#: build/trans_presets.java:2943
-msgid "excrement_bags"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2952
-msgid "Account or loyalty cards"
-msgstr ""
-
-#. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2955
-msgid "Cash"
-msgstr "現金"
-
-#. group "Cash"
-#: build/trans_presets.java:2956
-msgid "Bank"
-msgstr "銀行"
-
-#. item "Cash/Bank"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2958
-msgid "Edit Bank"
-msgstr "編輯銀行"
-
-#: build/trans_presets.java:2963 build/trans_presets.java:2972
-msgid "Automated Teller Machine"
-msgstr "自動提款機(ATM)"
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2965
-msgid "Money Exchange"
-msgstr "金錢兌換所"
-
-#. item "Cash/Money Exchange"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2967
-msgid "Edit Money Exchange"
-msgstr "編輯金錢兌換所"
-
-#. item "Cash/Automated Teller Machine"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2974
-msgid "Edit Automated Teller Machine"
-msgstr "編輯自動提款機"
-
-#. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2979
-msgid "Health"
-msgstr "健康"
-
-#. group "Health"
-#: build/trans_presets.java:2980
-msgid "Doctors"
-msgstr "醫師"
-
-#. item "Health/Doctors"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2982
-msgid "Edit Doctors"
-msgstr "編輯醫師"
-
-#: build/trans_presets.java:2987
-msgid "Dentist"
-msgstr "牙醫"
-
-#. item "Health/Dentist"
-#: build/trans_presets.java:2988
-msgid "Edit Dentist"
-msgstr "編輯牙醫"
-
-#: build/trans_presets.java:2993
-msgid "Pharmacy"
-msgstr "藥局"
-
-#. item "Health/Pharmacy"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2995
-msgid "Edit Pharmacy"
-msgstr "編輯藥局"
-
-#. item "Health/Pharmacy" label "Edit Pharmacy"
-#. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2997
-msgid "Dispensing"
-msgstr "配藥"
-
-#: build/trans_presets.java:3001
-msgid "Hospital"
-msgstr "醫院"
-
-#. item "Health/Hospital"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3003
-msgid "Edit Hospital"
-msgstr "編輯醫院"
-
-#. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3007
+#. item "Health/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:3104
 msgid "Emergency Access Point"
 msgstr "緊急連絡點"
@@ -29189,5 +29713,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:3010
+#: build/trans_presets.java:3107
 msgid "Edit Emergency Access Point"
 msgstr "編輯緊急連絡點"
@@ -29196,15 +29720,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3110
 msgid "Point Number"
 msgstr "連絡點編號"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3111
 msgid "Point Name"
 msgstr "連絡點名稱"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3114
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -29212,5 +29736,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3117
 msgid "Veterinary"
 msgstr "獸醫"
@@ -29219,368 +29743,374 @@
 #. <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:3023
+#: build/trans_presets.java:3120
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
-#: build/trans_presets.java:3030
+#. item "Places/Locality" text "Name"
+#: build/trans_presets.java:3127 build/trans_presets.java:3233
 msgid "Geography"
 msgstr "地理學"
 
 #. group "Geography"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3128
+msgid "Boundaries"
+msgstr "邊界"
+
+#. group "Geography/Boundaries"
+#: build/trans_presets.java:3129
+msgid "National"
+msgstr "國界"
+
+#. item "Geography/Boundaries/National"
+#: build/trans_presets.java:3130
+msgid "Edit National Boundary"
+msgstr "編輯國界"
+
+#. item "Geography/Boundaries/National" text "Name"
+#: build/trans_presets.java:3135
+msgid "Administrative"
+msgstr "行政區"
+
+#. item "Geography/Boundaries/Administrative"
+#: build/trans_presets.java:3136
+msgid "Edit Administrative Boundary"
+msgstr "編輯行政區邊界"
+
+#. item "Geography/Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:3141
+msgid "Civil"
+msgstr "城市的"
+
+#. item "Geography/Boundaries/Civil"
+#: build/trans_presets.java:3142
+msgid "Edit Civil Boundary"
+msgstr "編輯城市邊界"
+
+#. item "Geography/Boundaries/Civil" text "Name"
+#: build/trans_presets.java:3147
+msgid "Political"
+msgstr "政治的"
+
+#. item "Geography/Boundaries/Political"
+#: build/trans_presets.java:3148
+msgid "Edit Political Boundary"
+msgstr "編輯政治的邊界"
+
+#. item "Geography/Boundaries/Political" text "Name"
+#: build/trans_presets.java:3153
+msgid "National park"
+msgstr "國家公園"
+
+#. item "Geography/Boundaries/National park"
+#: build/trans_presets.java:3154
+msgid "Edit National Park Boundary"
+msgstr "編輯國家公園"
+
+#. item "Geography/Boundaries/National park" text "Name"
+#: build/trans_presets.java:3160
 msgid "Places"
 msgstr "地名"
 
-#. group "Geography/Places"
-#: build/trans_presets.java:3032
+#. group "Places"
+#: build/trans_presets.java:3161
 msgid "Continent"
 msgstr ""
 
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:3033
+#. item "Places/Continent"
+#: build/trans_presets.java:3162
 msgid "Edit Continent"
 msgstr ""
 
-#. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:3038
+#. item "Places/Continent" text "Name"
+#: build/trans_presets.java:3167
 msgid "Country"
 msgstr "國家"
 
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:3039
+#. item "Places/Country"
+#: build/trans_presets.java:3168
 msgid "Edit Country"
 msgstr "編輯國家"
 
-#. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:3044
+#. item "Places/Country" text "Name"
+#: build/trans_presets.java:3173
 msgid "State"
 msgstr ""
 
-#. item "Geography/Places/State"
-#: build/trans_presets.java:3045
+#. item "Places/State"
+#: build/trans_presets.java:3174
 msgid "Edit State"
 msgstr ""
 
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:3050
+#. item "Places/State" text "Name"
+#: build/trans_presets.java:3179
 msgid "Region"
 msgstr ""
 
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:3051
+#. item "Places/Region"
+#: build/trans_presets.java:3180
 msgid "Edit Region"
 msgstr ""
 
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:3056
+#. item "Places/Region" text "Name"
+#: build/trans_presets.java:3185
 msgid "County"
 msgstr "縣"
 
-#. item "Geography/Places/County"
-#: build/trans_presets.java:3057
+#. item "Places/County"
+#: build/trans_presets.java:3186
 msgid "Edit County"
 msgstr "編輯縣"
 
-#. item "Geography/Places/County" text "Name"
+#. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3192
 msgid "City"
 msgstr "市"
 
-#. item "Geography/Places/City"
-#: build/trans_presets.java:3064
+#. item "Places/City"
+#: build/trans_presets.java:3193
 msgid "Edit City"
 msgstr "編輯市"
 
-#. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:3069
+#. item "Places/City" text "Name"
+#: build/trans_presets.java:3198
 msgid "Town"
 msgstr "鄉/鎮"
 
-#. item "Geography/Places/Town"
+#. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3200
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
-#. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:3076
+#. item "Places/Town" text "Name"
+#: build/trans_presets.java:3205
 msgid "Suburb"
 msgstr "郊區"
 
-#. item "Geography/Places/Suburb"
+#. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3207
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
-#. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:3083
+#. item "Places/Suburb" text "Name"
+#: build/trans_presets.java:3212
 msgid "Village"
 msgstr "村/里"
 
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:3084
+#. item "Places/Village"
+#: build/trans_presets.java:3213
 msgid "Edit Village"
 msgstr "編輯村/里"
 
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:3089
+#. item "Places/Village" text "Name"
+#: build/trans_presets.java:3218
 msgid "Hamlet"
 msgstr ""
 
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:3090
+#. item "Places/Hamlet"
+#: build/trans_presets.java:3219
 msgid "Edit Hamlet"
 msgstr ""
 
-#. item "Geography/Places/Hamlet" text "Name"
+#. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:3225
 msgid "Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality"
+#. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3227
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:3103
+#. group "Geography"
+#: build/trans_presets.java:3234
+msgid "Peak"
+msgstr "峰"
+
+#. item "Geography/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:3236
+msgid "Edit Peak"
+msgstr "編輯山峰"
+
+#. item "Geography/Peak" text "Elevation"
+#: build/trans_presets.java:3241
+msgid "Glacier"
+msgstr "冰河"
+
+#. item "Geography/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:3243
+msgid "Edit Glacier"
+msgstr "編輯冰河"
+
+#. item "Geography/Glacier" text "Elevation"
+#: build/trans_presets.java:3248
+msgid "Volcano"
+msgstr "火山"
+
+#. item "Geography/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:3250
+msgid "Edit Volcano"
+msgstr "編輯火山"
+
+#. item "Geography/Volcano" text "Elevation"
+#: build/trans_presets.java:3255
+msgid "Cave Entrance"
+msgstr "洞窟入口"
+
+#. item "Geography/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:3257
+msgid "Edit Cave Entrance"
+msgstr "編輯洞窟入口"
+
+#. item "Geography/Cave Entrance" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3262
 msgid "Island"
 msgstr "島嶼"
 
-#. item "Geography/Places/Island"
+#. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3264
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
-#. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:3110
+#. item "Geography/Island" text "Name"
+#: build/trans_presets.java:3269
 msgid "Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet"
+#. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3271
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Geography/Places/Islet" text "Name"
+#. item "Geography/Islet" text "Name"
+#: build/trans_presets.java:3277
+#, fuzzy
+msgid "Nature"
+msgstr "自然"
+
+#. group "Nature"
+#: build/trans_presets.java:3278
+msgid "Tree"
+msgstr "樹"
+
+#. item "Nature/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3281
+msgid "Edit Tree"
+msgstr "編輯樹"
+
+#. item "Nature/Tree" text "Height"
+#: build/trans_presets.java:3286
+msgid "Botanical Name"
+msgstr "植物學名"
+
+#. item "Nature/Tree" text "Botanical Name"
+#: build/trans_presets.java:3288
+msgid "Wood"
+msgstr ""
+
+#. item "Nature/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3291
+msgid "Edit Wood"
+msgstr ""
+
+#. item "Nature/Wood" combo "Type"
+#. item "Nature/Forest" combo "Type"
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "coniferous"
+msgstr "松類"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "deciduous"
+msgstr "落葉類"
+
+#: build/trans_presets.java:3294 build/trans_presets.java:3303
+msgid "mixed"
+msgstr "混合"
+
+#: build/trans_presets.java:3296
+msgid "Forest"
+msgstr "森林"
+
+#. item "Nature/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3299
+msgid "Edit Forest Landuse"
+msgstr "編輯森林土地利用"
+
+#: build/trans_presets.java:3305
+msgid "Nature Reserve"
+msgstr "自然保育"
+
+#. item "Nature/Nature Reserve"
+#: build/trans_presets.java:3306
+msgid "Edit Nature Reserve"
+msgstr "編輯自然保育"
+
+#. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
-msgid "Cave Entrance"
-msgstr "洞窟入口"
-
-#. item "Geography/Places/Cave Entrance"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3120
-msgid "Edit Cave Entrance"
-msgstr "編輯洞窟入口"
-
-#. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:3124
-msgid "Peak"
-msgstr "峰"
-
-#. item "Geography/Places/Peak"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3126
-msgid "Edit Peak"
-msgstr "編輯山峰"
-
-#. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:3131
-msgid "Glacier"
-msgstr "冰河"
-
-#. item "Geography/Places/Glacier"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3133
-msgid "Edit Glacier"
-msgstr "編輯冰河"
-
-#. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:3138
-msgid "Volcano"
-msgstr "火山"
-
-#. item "Geography/Places/Volcano"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3140
-msgid "Edit Volcano"
-msgstr "編輯火山"
-
-#. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:3146
-msgid "Boundaries"
-msgstr "邊界"
-
-#. group "Boundaries"
-#: build/trans_presets.java:3147
-msgid "National"
-msgstr "國界"
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:3148
-msgid "Edit National Boundary"
-msgstr "編輯國界"
-
-#. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:3153
-msgid "Administrative"
-msgstr "行政區"
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:3154
-msgid "Edit Administrative Boundary"
-msgstr "編輯行政區邊界"
-
-#. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3159
-msgid "Civil"
-msgstr "城市的"
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:3160
-msgid "Edit Civil Boundary"
-msgstr "編輯城市邊界"
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3165
-msgid "Political"
-msgstr "政治的"
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:3166
-msgid "Edit Political Boundary"
-msgstr "編輯政治的邊界"
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:3171
-msgid "National park"
-msgstr "國家公園"
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:3172
-msgid "Edit National Park Boundary"
-msgstr "編輯國家公園"
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3311
+msgid "Scree"
+msgstr ""
+
+#. item "Nature/Scree"
+#: build/trans_presets.java:3312
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Nature/Scree" text "Name"
+#: build/trans_presets.java:3316
+msgid "Fell"
+msgstr ""
+
+#. item "Nature/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3318
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Nature/Fell" text "Name"
+#: build/trans_presets.java:3322
+msgid "Scrub"
+msgstr ""
+
+#. item "Nature/Scrub"
+#: build/trans_presets.java:3323
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Nature/Scrub" text "Name"
+#: build/trans_presets.java:3327
+msgid "Heath"
+msgstr ""
+
+#. item "Nature/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3329
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Nature/Heath" text "Name"
+#: build/trans_presets.java:3334
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:3179
-msgid "Tree"
-msgstr "樹"
-
-#. item "Land use/Tree"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:3182
-msgid "Edit Tree"
-msgstr "編輯樹"
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3187
-msgid "Botanical Name"
-msgstr "植物學名"
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3189
-msgid "Wood"
-msgstr ""
-
-#. item "Land use/Wood"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3192
-msgid "Edit Wood"
-msgstr ""
-
-#. item "Land use/Wood" combo "Type"
-#. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "coniferous"
-msgstr "松類"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "deciduous"
-msgstr "落葉類"
-
-#: build/trans_presets.java:3195 build/trans_presets.java:3204
-msgid "mixed"
-msgstr "混合"
-
-#: build/trans_presets.java:3197
-msgid "Forest"
-msgstr "森林"
-
-#. item "Land use/Forest"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3200
-msgid "Edit Forest Landuse"
-msgstr "編輯森林土地利用"
-
-#: build/trans_presets.java:3206
-msgid "Nature Reserve"
-msgstr "自然保育"
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3207
-msgid "Edit Nature Reserve"
-msgstr "編輯自然保育"
-
-#. item "Land use/Nature Reserve" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3212
-msgid "Scree"
-msgstr ""
-
-#. item "Land use/Scree"
-#: build/trans_presets.java:3213
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3217
-msgid "Scrub"
-msgstr ""
-
-#. item "Land use/Scrub"
-#: build/trans_presets.java:3218
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3222
-msgid "Fell"
-msgstr ""
-
-#. item "Land use/Fell"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3224
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3228
-msgid "Heath"
-msgstr ""
-
-#. item "Land use/Heath"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3230
-msgid "Edit Heath"
-msgstr ""
-
-#. item "Land use/Heath" text "Name"
-#. <separator/>
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3335
 msgid "Farmyard"
 msgstr ""
@@ -29589,45 +30119,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:3238
+#: build/trans_presets.java:3338
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3343
 msgid "Farmland"
 msgstr "農田"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3344
 msgid "Edit Farmland Landuse"
 msgstr "編輯農田土地利用"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3349
 msgid "Meadow"
 msgstr "青草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3350
 msgid "Edit Meadow Landuse"
 msgstr "編輯青草地土地利用"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3355
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3356
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3361
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3362
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29635,25 +30165,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3368
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3369
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3373
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3374
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3379
 msgid "Village Green"
 msgstr ""
@@ -29661,10 +30191,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3381
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3386
 msgid "Common"
 msgstr ""
@@ -29672,20 +30202,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3388
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3392
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3293
+#: build/trans_presets.java:3393
 msgid "Edit Park"
 msgstr "編輯公園"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3397
 msgid "Recreation Ground"
 msgstr ""
@@ -29693,5 +30223,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3399
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29699,15 +30229,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3405
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3406
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3411
 msgid "Graveyard"
 msgstr ""
@@ -29715,9 +30245,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3313
+#: build/trans_presets.java:3413
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3419
 msgid "Cemetery"
 msgstr ""
@@ -29725,39 +30255,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3321
+#: build/trans_presets.java:3421
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3428
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3429
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3434
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3435
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3340
+#: build/trans_presets.java:3440
 msgid "Industrial"
 msgstr "工業區"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3441
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3446
 msgid "Railway land"
 msgstr ""
@@ -29765,15 +30295,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3348
+#: build/trans_presets.java:3448
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3453
 msgid "Military"
 msgstr "軍事"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3354
+#: build/trans_presets.java:3454
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29781,52 +30311,185 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3360
+#: build/trans_presets.java:3460
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3461
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3366
+#: build/trans_presets.java:3466
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3467
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3472
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3473
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3378
+#: build/trans_presets.java:3478
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3479
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3484
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3485
 msgid "Edit Quarry Landuse"
 msgstr ""
+
+#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:3492
+#, fuzzy
+msgid "Annotation"
+msgstr "纜車站"
+
+#. group "Annotation"
+#: build/trans_presets.java:3493
+msgid "Addresses"
+msgstr "地址"
+
+#. item "Annotation/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3496
+msgid "Edit Address Information"
+msgstr "編輯地址資訊"
+
+#. item "Annotation/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:3498
+msgid "House number"
+msgstr "門牌號碼"
+
+#. item "Annotation/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:3500
+msgid "House name"
+msgstr "房屋名稱"
+
+#. item "Annotation/Addresses" text "House name"
+#: build/trans_presets.java:3501
+msgid "Street name"
+msgstr "街道名稱"
+
+#. item "Annotation/Addresses" text "Street name"
+#: build/trans_presets.java:3502
+msgid "City name"
+msgstr "城市名稱"
+
+#. item "Annotation/Addresses" text "City name"
+#: build/trans_presets.java:3503
+msgid "Post code"
+msgstr "郵遞區號"
+
+#. item "Annotation/Addresses" text "Post code"
+#: build/trans_presets.java:3504
+msgid "Country code"
+msgstr "國碼"
+
+#. item "Annotation/Addresses" combo "Country code"
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "AT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "CH"
+msgstr "H"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "DE"
+msgstr "東"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "FR"
+msgstr "R"
+
+#: build/trans_presets.java:3504
+msgid "GB"
+msgstr ""
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "IT"
+msgstr "IATA"
+
+#: build/trans_presets.java:3504
+#, fuzzy
+msgid "US"
+msgstr "南"
+
+#. item "Annotation/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:3510
+msgid "Edit Address Interpolation"
+msgstr "編輯地址填寫"
+
+#. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:3512
+msgid "Numbering scheme"
+msgstr "編號規則"
+
+#. item "Annotation/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:3512
+msgid "odd"
+msgstr "奇數"
+
+#: build/trans_presets.java:3512
+msgid "even"
+msgstr "偶數"
+
+#: build/trans_presets.java:3512
+msgid "alphabetic"
+msgstr "按字母順序"
+
+#: build/trans_presets.java:3514
+#, fuzzy
+msgid "Contact"
+msgstr "內容"
+
+#. item "Annotation/Contact"
+#: build/trans_presets.java:3515
+#, fuzzy
+msgid "Edit Contact information"
+msgstr "加入作者資訊"
+
+#. item "Annotation/Contact" text "Email Address"
+#. <space />
+#: build/trans_presets.java:3523
+msgid "Wikipedia"
+msgstr ""
+
+#. item "Annotation/Contact" text "Wikipedia"
+#: build/trans_presets.java:3524
+msgid "Image"
+msgstr "圖片"
 
 #. item "Relations/Multipolygon"
@@ -29834,5 +30497,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:3397
+#: build/trans_presets.java:3532
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29844,5 +30507,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3403 build/trans_presets.java:3420
+#: build/trans_presets.java:3538 build/trans_presets.java:3555
 msgid "outer segment"
 msgstr ""
@@ -29850,5 +30513,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3404 build/trans_presets.java:3421
+#: build/trans_presets.java:3539 build/trans_presets.java:3556
 msgid "inner segment"
 msgstr ""
@@ -29856,5 +30519,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3407
+#: build/trans_presets.java:3542
 msgid "Boundary"
 msgstr ""
@@ -29865,5 +30528,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3412
+#: build/trans_presets.java:3547
 msgid "Edit Boundary"
 msgstr ""
@@ -29871,36 +30534,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3416
+#: build/trans_presets.java:3551
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3552
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3422
+#: build/trans_presets.java:3557
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3423
+#: build/trans_presets.java:3558
 msgid "Administration centre"
 msgstr ""
@@ -29908,5 +30571,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3561
 msgid "Turn restriction"
 msgstr "轉彎限制"
@@ -29915,5 +30578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3564
 msgid "Edit Turn Restriction"
 msgstr "編輯轉彎限制"
@@ -29921,34 +30584,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3431
+#: build/trans_presets.java:3566
 msgid "only_straight_on"
 msgstr ""
@@ -29957,15 +30620,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3436
+#: build/trans_presets.java:3571
 msgid "from way"
 msgstr "from 路徑"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3437
+#: build/trans_presets.java:3572
 msgid "via node or way"
 msgstr "via 節點或路徑"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3438
+#: build/trans_presets.java:3573
 msgid "to way"
 msgstr "to 路徑"
@@ -29973,5 +30636,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3576
 msgid "Route"
 msgstr "路線"
@@ -29980,5 +30643,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3579
 msgid "Edit Route"
 msgstr "編輯路線"
@@ -29986,132 +30649,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "Route type"
 msgstr "路線類型"
 
-#. item "Relations/Route" combo "Route type"
-#. color destination
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="bicycle" b="no"/>
-#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="bicycle" v="designated"/>
-#. color horse
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cycleway"/>
-#. color foot
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. color foot
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="designated"/>
-#. <condition k="foot" v="designated"/>
-#. color bicycle
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="path"/>
-#. <condition k="bicycle" v="official"/>
-#. <condition k="foot" v="official"/>
-#. color roundabout
-#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- cycleway tags -->
-#.
-#. <rule>
-#. <condition k="cycleway" v="lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite_track"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3446 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:723 build/trans_style.java:748
-#: build/trans_style.java:757 build/trans_style.java:934
-#: build/trans_style.java:942 build/trans_style.java:950
-#: build/trans_style.java:958 build/trans_style.java:966
-msgid "bicycle"
-msgstr "單車"
-
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "ski"
 msgstr ""
@@ -30179,5 +30731,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3446 build/trans_style.java:247
+#: build/trans_presets.java:3581 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30187,9 +30739,9 @@
 msgstr "步行"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "tram"
 msgstr "路面電車"
 
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3581
 msgid "detour"
 msgstr ""
@@ -30203,10 +30755,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3446 build/trans_style.java:1233
+#: build/trans_presets.java:3581 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鐵"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3584
 msgid "Symbol description"
 msgstr ""
@@ -30214,31 +30766,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3452
+#: build/trans_presets.java:3587
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3589
 msgid "connection"
 msgstr "連線"
 
-#: build/trans_presets.java:3455
+#: build/trans_presets.java:3590
 msgid "Color (hex)"
 msgstr "顏色(16 進制)"
@@ -30247,30 +30799,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3593
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3594
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3595
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3596
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3462
+#: build/trans_presets.java:3597
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3463
+#: build/trans_presets.java:3598
 msgid "backward halt point"
 msgstr ""
@@ -34369,8 +34921,47 @@
 msgstr ""
 
-#. http://88.53.214.52/arcgis/services/WGS84_F33/OrtofotoATA_20072008_f33/MapServer/WMSServer?LAYERS=0&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fpng&STYLES=&
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
 #: build/trans_wms.java:49
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Keep backup files"
+#~ msgstr "保留備份檔案"
+
+#~ msgid ""
+#~ "You cannot align connected segments.\n"
+#~ "Please select two segments that don''t share any nodes."
+#~ msgstr ""
+#~ "您不能對齊相互連接的區段。\n"
+#~ "請選取兩個沒有共用任何節點的區段。"
+
+#~ msgid ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+#~ "<b>Tools</b>\n"
+#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<html>\n"
+#~ "<div style=\"font-family:sans-serif\">\n"
+#~ "<ul>\n"
+#~ "  <li><b>對齊區段。</b> 請按 <b><i><span style=\"color:green\">Shift-A</"
+#~ "span></i></b>。另外您可以在<b>工具</b>選單找到這個指令\n"
+#~ "，也可以把這個動作放置到<b>工具列</b>上。\n"
+#~ "  </li>\n"
+#~ "</ul>\n"
+#~ "</div>\n"
+#~ "</html>\n"
+#~ "\n"
+
+#~ msgid "Waterway Point"
+#~ msgstr "水路點"
 
 #~ msgid "Open in Browser"
@@ -34647,7 +35238,4 @@
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "檔案「{0}」的日期無法解析。"
-
-#~ msgid "Image"
-#~ msgstr "圖片"
 
 #~ msgid "Anonymous"
